Fixes warnings from the Potential Programming Problems category of Eclipse SDK: access to references known to be null and assignments with no effect.

7 files changed, 9 insertions, 9 deletions

diff --git a/test/net/java/sip/communicator/slick/protocol/gibberish/GibberishSlickFixture.java b/test/net/java/sip/communicator/slick/protocol/gibberish/GibberishSlickFixture.java
index 301135d..4e35011 100644
--- a/test/net/java/sip/communicator/slick/protocol/gibberish/GibberishSlickFixture.java
+++ b/test/net/java/sip/communicator/slick/protocol/gibberish/GibberishSlickFixture.java
@@ -112,7 +112,7 @@ public class GibberishSlickFixture
 
         assertTrue(
             "Failed to find a provider factory service for protocol Gibberish",
-            serRefs != null || serRefs.length >  0);
+            (serRefs != null) && (serRefs.length > 0));
 
         //Keep the reference for later usage.
         providerFactory = (ProtocolProviderFactory)bc.getService(serRefs[0]);
diff --git a/test/net/java/sip/communicator/slick/protocol/icq/IcqSlickFixture.java b/test/net/java/sip/communicator/slick/protocol/icq/IcqSlickFixture.java
index 3abfefb..0939a64 100644
--- a/test/net/java/sip/communicator/slick/protocol/icq/IcqSlickFixture.java
+++ b/test/net/java/sip/communicator/slick/protocol/icq/IcqSlickFixture.java
@@ -87,7 +87,7 @@ public class IcqSlickFixture extends TestCase
 
         assertTrue(
             "Failed to find a provider factory service for protocol ICQ",
-            serRefs != null || serRefs.length >  0);
+            (serRefs != null) && (serRefs.length >  0));
 
         //Keep the reference for later usage.
         providerFactory = (ProtocolProviderFactory)
diff --git a/test/net/java/sip/communicator/slick/protocol/icq/TestAccountInstallation.java b/test/net/java/sip/communicator/slick/protocol/icq/TestAccountInstallation.java
index bcd5eee..d458d23 100644
--- a/test/net/java/sip/communicator/slick/protocol/icq/TestAccountInstallation.java
+++ b/test/net/java/sip/communicator/slick/protocol/icq/TestAccountInstallation.java
@@ -102,7 +102,7 @@ public class TestAccountInstallation extends TestCase
 
         assertTrue(
             "Failed to find a provider factory service for protocol ICQ",
-            serRefs != null || serRefs.length >  0);
+            (serRefs != null) && (serRefs.length >  0));
 
         //Keep the reference for later usage.
         ProtocolProviderFactory icqProviderFactory =
@@ -232,7 +232,7 @@ public class TestAccountInstallation extends TestCase
 
         assertTrue(
             "Failed to find a provider factory service for protocol ICQ",
-            serRefs != null || serRefs.length >  0);
+            (serRefs != null) && (serRefs.length >  0));
 
         //Keep the reference for later usage.
         ProtocolProviderFactory icqProviderFactory =
@@ -351,7 +351,7 @@ public class TestAccountInstallation extends TestCase
 
         assertTrue(
             "Failed to find a provider factory service for protocol ICQ",
-            serRefs != null || serRefs.length >  0);
+            (serRefs != null) && (serRefs.length >  0));
 
         //Keep the reference for later usage.
         icqProviderFactory = (ProtocolProviderFactory)
diff --git a/test/net/java/sip/communicator/slick/protocol/jabber/JabberSlickFixture.java b/test/net/java/sip/communicator/slick/protocol/jabber/JabberSlickFixture.java
index 4c714e4..865eddf 100644
--- a/test/net/java/sip/communicator/slick/protocol/jabber/JabberSlickFixture.java
+++ b/test/net/java/sip/communicator/slick/protocol/jabber/JabberSlickFixture.java
@@ -121,7 +121,7 @@ public class JabberSlickFixture
 
         assertTrue(
             "Failed to find a provider factory service for protocol Jabber",
-            serRefs != null || serRefs.length >  0);
+            (serRefs != null) && (serRefs.length >  0));
 
         //Keep the reference for later usage.
         providerFactory = (ProtocolProviderFactory)bc.getService(serRefs[0]);
diff --git a/test/net/java/sip/communicator/slick/protocol/msn/MsnSlickFixture.java b/test/net/java/sip/communicator/slick/protocol/msn/MsnSlickFixture.java
index a1ff1e2..330c1e2 100644
--- a/test/net/java/sip/communicator/slick/protocol/msn/MsnSlickFixture.java
+++ b/test/net/java/sip/communicator/slick/protocol/msn/MsnSlickFixture.java
@@ -112,7 +112,7 @@ public class MsnSlickFixture
 
         assertTrue(
             "Failed to find a provider factory service for protocol msn",
-            serRefs != null || serRefs.length >  0);
+            (serRefs != null) && (serRefs.length >  0));
 
         //Keep the reference for later usage.
         providerFactory = (ProtocolProviderFactory)bc.getService(serRefs[0]);
diff --git a/test/net/java/sip/communicator/slick/protocol/sip/SipSlickFixture.java b/test/net/java/sip/communicator/slick/protocol/sip/SipSlickFixture.java
index 4afba67..557e23e 100644
--- a/test/net/java/sip/communicator/slick/protocol/sip/SipSlickFixture.java
+++ b/test/net/java/sip/communicator/slick/protocol/sip/SipSlickFixture.java
@@ -109,7 +109,7 @@ public class SipSlickFixture
 
         assertTrue(
             "Failed to find a provider factory service for protocol SIP",
-            serRefs != null || serRefs.length >  0);
+            (serRefs != null) && (serRefs.length >  0));
 
         //Keep the reference for later usage.
         providerFactory = (ProtocolProviderFactory)bc.getService(serRefs[0]);
diff --git a/test/net/java/sip/communicator/slick/protocol/yahoo/YahooSlickFixture.java b/test/net/java/sip/communicator/slick/protocol/yahoo/YahooSlickFixture.java
index 1a62418..75d9e0c 100644
--- a/test/net/java/sip/communicator/slick/protocol/yahoo/YahooSlickFixture.java
+++ b/test/net/java/sip/communicator/slick/protocol/yahoo/YahooSlickFixture.java
@@ -112,7 +112,7 @@ public class YahooSlickFixture
 
         assertTrue(
             "Failed to find a provider factory service for protocol yahoo",
-            serRefs != null || serRefs.length >  0);
+            (serRefs != null) && (serRefs.length >  0));
 
         //Keep the reference for later usage.
         providerFactory = (ProtocolProviderFactory)bc.getService(serRefs[0]);