[vlma-devel] commit: Redundant null check. (Adrien Grand )

[git version control]

vlma | branch: master | Adrien Grand <jpountz at videolan.org> | Mon Apr 13 22:09:35 2009 +0200| [789a39b19b0e200bc3320b08a57e30a83e6f5a6d] | committer: Adrien Grand 

Redundant null check.

> http://git.videolan.org/gitweb.cgi/vlma.git/?a=commit;h=789a39b19b0e200bc3320b08a57e30a83e6f5a6d
---

 .../vlma/order/watcher/RtspStreamWatcher.java      |    1 +
 .../java/org/videolan/vlma/util/SatcodxUtils.java  |    6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/vlma-core/src/main/java/org/videolan/vlma/order/watcher/RtspStreamWatcher.java b/vlma-core/src/main/java/org/videolan/vlma/order/watcher/RtspStreamWatcher.java
index 71e2a9e..d731246 100644
--- a/vlma-core/src/main/java/org/videolan/vlma/order/watcher/RtspStreamWatcher.java
+++ b/vlma-core/src/main/java/org/videolan/vlma/order/watcher/RtspStreamWatcher.java
@@ -136,6 +136,7 @@ public class RtspStreamWatcher implements StreamWatcher {
                     /* Do nothing */
                 }
             } catch (InterruptedException e) {
+                logger.warn("Waiter thread was interrupted", e);
             } finally {
                 try {
                     socket.close();
diff --git a/vlma-core/src/main/java/org/videolan/vlma/util/SatcodxUtils.java b/vlma-core/src/main/java/org/videolan/vlma/util/SatcodxUtils.java
index aa68311..16c8b1a 100644
--- a/vlma-core/src/main/java/org/videolan/vlma/util/SatcodxUtils.java
+++ b/vlma-core/src/main/java/org/videolan/vlma/util/SatcodxUtils.java
@@ -121,11 +121,7 @@ public class SatcodxUtils {
                     text = text.getNextSibling();
                 }
             }
-            if (text == null) {
-                result = "";
-            } else {
-                result = ((TextNode) text).getText();
-            }
+            result = ((TextNode) text).getText();
         }
 
         result = result.replaceAll("&nbsp;", " ");