svn commit: r832602 - /sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/app/ControlListener.java

[cziegeler]

Author: cziegeler
Date: Tue Nov  3 23:31:32 2009
New Revision: 832602

URL: http://svn.apache.org/viewvc?rev=832602&view=rev
Log:
Remove redundant null check

Modified:
    
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/app/ControlListener.java

Modified: 
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/app/ControlListener.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/app/ControlListener.java?rev=832602&r1=832601&r2=832602&view=diff
==============================================================================
--- 
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/app/ControlListener.java
 (original)
+++ 
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/app/ControlListener.java
 Tue Nov  3 23:31:32 2009
@@ -85,7 +85,7 @@
      * <code>[ host ":" ] port</code>. If the parameter is empty or
      * <code>null</code> it defaults to <i>localhost:63000</i>. If the host 
name
      * is missing it defaults to <i>localhost</i>.
-     * 
+     *
      * @param slingMain The Main class reference. This is only required if this
      *            instance is used for the server side to listen for remote 
stop
      *            commands. Otherwise this argument may be <code>null</code>.
@@ -177,11 +177,9 @@
         } catch (IOException ioe) {
             Main.error("Failure reading from client", ioe);
         } finally {
-            if (server != null) {
-                try {
-                    server.close();
-                } catch (IOException ignore) {
-                }
+            try {
+                server.close();
+            } catch (IOException ignore) {
             }
         }
     }