Very Small Changes

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

src/java/org/jivesoftware/openfire/mediaproxy/Channel.java

@@ -101,13 +101,15 @@ abstract class Channel implements Runnable {
     /**
      * Remove every Listeners
      */
-    public void removeListener() {
+    public void removeListeners() {
         listeners.removeAll(listeners);
     }
 
     public void cancel() {
         this.enabled = false;
-        dataSocket.close();
+        if (dataSocket != null){
+            dataSocket.close();
+        }
     }
 
     /**

src/java/org/jivesoftware/openfire/mediaproxy/MediaProxyService.java

@@ -205,7 +205,7 @@ public class MediaProxyService extends BasicModule
                                 publicIp.addAttribute("ip", ip);
                             }
                         } catch (UnknownHostException e) {
-                            e.printStackTrace();
+                            Log.error(e);
                         }
 
                     } else {

src/java/org/jivesoftware/openfire/mediaproxy/MediaProxySession.java

@@ -238,10 +238,10 @@ public abstract class MediaProxySession extends Thread implements ProxyCandidate
             Log.error(e);
         }
 
-        channelAtoB.removeListener();
-        channelAtoBControl.removeListener();
-        channelBtoA.removeListener();
-        channelBtoAControl.removeListener();
+        channelAtoB.removeListeners();
+        channelAtoBControl.removeListeners();
+        channelBtoA.removeListeners();
+        channelBtoAControl.removeListeners();
 
         try {
             channelAtoB.cancel();