From 7784ee911483f805af22a08234e1ae05545d36f2 Mon Sep 17 00:00:00 2001
From: Yana Stamcheva <yana@jitsi.org>
Date: Tue, 13 Feb 2007 16:58:39 +0000
Subject: [PATCH] fix NullPointerException if no proxy is specified in the icq
 registration wizard

---
 .../IcqAccountRegistrationWizard.java         | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
index 9c2867c04..7160fde28 100644
--- a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
@@ -88,17 +88,27 @@ public Iterator getSummary() {
         summaryTable.put("UIN", registration.getUin());
         summaryTable.put("Remember password",
                 new Boolean(registration.isRememberPassword()));
-        summaryTable.put(Resources.getString("proxy"),
-        registration.getProxy());
-        summaryTable.put(Resources.getString("proxyPort"),
-                         registration.getProxyPort());
-        summaryTable.put(Resources.getString("proxyType"),
-                         registration.getProxyType());
-        summaryTable.put(Resources.getString("proxyUsername"),
-                         registration.getProxyPort());
-        summaryTable.put(Resources.getString("proxyPassword"),
-                         registration.getProxyType());
-
+        
+        if(registration.getProxy() != null)
+            summaryTable.put(Resources.getString("proxy"),
+                            registration.getProxy());
+        
+        if(registration.getProxyPort() != null)
+            summaryTable.put(Resources.getString("proxyPort"),
+                            registration.getProxyPort());
+        
+        if(registration.getProxyType() != null)
+            summaryTable.put(Resources.getString("proxyType"),
+                            registration.getProxyType());
+        
+        if(registration.getProxyPort() != null)
+            summaryTable.put(Resources.getString("proxyUsername"),
+                            registration.getProxyPort());
+        
+        if(registration.getProxyType() != null)
+            summaryTable.put(Resources.getString("proxyPassword"),
+                            registration.getProxyType());
+        
         return summaryTable.entrySet().iterator();
     }