[GATE-121] Fixed major issue with xmlns check during registration cause NPE.

Silenced some MSN 'minor errors' for now.  Will investigate more later.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@6053 b35dd754-fafc-0310-a699-88a17e54d16e

src/plugins/gateway/changelog.html

@@ -158,9 +158,22 @@ hr {
 
 	<div id="pageBody">
 
+
+<h2>1.0 Beta 5a -- <span style="font-weight: normal;">November 10, 2006</span></h2>
+
+<b>Bug Fixes</b>
+<ul>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/GATE-121'>GATE-121</a>] - IQ Register no longer causes NPE when registration does not include x namespace uri.</li>
+</ul>
+
+<b>Improvements</b>
+<ul>
+<li>MSN minor protocol errors silenced for now.</li>
+</ul>
+
 <h2>1.0 Beta 5 -- <span style="font-weight: normal;">November 10, 2006</span></h2>
 
-<b>Bug</b>
+<b>Bug Fixes</b>
 <ul>
 <li>[<a href='http://www.jivesoftware.org/issues/browse/GATE-47'>GATE-47</a>] - Delete functionality fixed for all but OSCAR</li>
 <li>[<a href='http://www.jivesoftware.org/issues/browse/GATE-71'>GATE-71</a>] - NullPointerException during registration fixed</li>
@@ -174,7 +187,7 @@ hr {
 <li>[<a href='http://www.jivesoftware.org/issues/browse/GATE-111'>GATE-111</a>] - CPU usage no longer hitting 100% on some systems</li>
 </ul>
 
-<b>Improvement</b>
+<b>Improvements</b>
 <ul>
 <li>[<a href='http://www.jivesoftware.org/issues/browse/GATE-37'>GATE-37</a>] - Add/remove support fixed for MSN.</li>
 <li>[<a href='http://www.jivesoftware.org/issues/browse/GATE-64'>GATE-64</a>] - IRC server and port now adjustable (via server properties)</li>

src/plugins/gateway/plugin.xml

@@ -8,7 +8,7 @@
     <name>IM Gateway</name>
     <description>Provides gateway connectivity to the other public instant messaging networks</description>
     <author>Daniel Henninger</author>
-    <version>1.0 Beta 5</version>
+    <version>1.0 Beta 5a</version>
     <date>11/10/2006</date>
     <minServerVersion>3.1.1</minServerVersion>
     <databaseKey>gateway</databaseKey>

src/plugins/gateway/src/java/org/jivesoftware/wildfire/gateway/BaseTransport.java

@@ -589,7 +589,7 @@ public abstract class BaseTransport implements Component, RosterEventListener {
                 else {
                     boolean rosterlessMode = false;
                     Element x = packet.getChildElement().element("x");
-                    if (x.getNamespaceURI().equals(IQ_GATEWAY_REGISTER)) {
+                    if (x != null && x.getNamespaceURI() != null && x.getNamespaceURI().equals(IQ_GATEWAY_REGISTER)) {
                         rosterlessMode = true;
                         Log.info("Registered " + packet.getFrom() + " as " + username + " in rosterless mode.");
                     }

src/plugins/gateway/src/java/org/jivesoftware/wildfire/gateway/protocols/msn/MSNListener.java

@@ -210,12 +210,12 @@ public class MSNListener extends MsnAdapter {
             msnSession.logOut();
         }
         else if (throwable.getClass().getName().equals("net.sf.jml.exception.MsnProtocolException")) {
-            Message m = new Message();
-            m.setType(Message.Type.error);
-            m.setTo(msnSession.getJIDWithHighestPriority());
-            m.setFrom(msnSession.getTransport().getJID());
-            m.setBody("MSN error: "+throwable.toString());
-            msnSession.getTransport().sendPacket(m);
+//            Message m = new Message();
+//            m.setType(Message.Type.error);
+//            m.setTo(msnSession.getJIDWithHighestPriority());
+//            m.setFrom(msnSession.getTransport().getJID());
+//            m.setBody("MSN error: "+throwable.toString());
+//            msnSession.getTransport().sendPacket(m);
         }
         else if (throwable.getClass().getName().equals("net.sf.jml.exception.MsgNotSendException")) {
             Message m = new Message();
@@ -234,12 +234,12 @@ public class MSNListener extends MsnAdapter {
             msnSession.getTransport().sendPacket(m);
         }
         else if (throwable.getClass().getName().equals("net.sf.jml.exception.UnsupportedProtocolException")) {
-            Message m = new Message();
-            m.setType(Message.Type.error);
-            m.setTo(msnSession.getJIDWithHighestPriority());
-            m.setFrom(msnSession.getTransport().getJID());
-            m.setBody("MSN protocol error: "+throwable.toString());
-            msnSession.getTransport().sendPacket(m);
+//            Message m = new Message();
+//            m.setType(Message.Type.error);
+//            m.setTo(msnSession.getJIDWithHighestPriority());
+//            m.setFrom(msnSession.getTransport().getJID());
+//            m.setBody("MSN protocol error: "+throwable.toString());
+//            msnSession.getTransport().sendPacket(m);
         }
         else {
             Message m = new Message();