svn commit: r1406894 - /river/jtsk/trunk/src/org/apache/river/impl/net/UriString.java

[peter_firmstone]

Author: peter_firmstone
Date: Thu Nov  8 02:02:43 2012
New Revision: 1406894

URL: http://svn.apache.org/viewvc?rev=1406894&view=rev
Log:
Fix NullPointerException bug revealed by MS Windows

Modified:
    river/jtsk/trunk/src/org/apache/river/impl/net/UriString.java

Modified: river/jtsk/trunk/src/org/apache/river/impl/net/UriString.java
URL: 
http://svn.apache.org/viewvc/river/jtsk/trunk/src/org/apache/river/impl/net/UriString.java?rev=1406894&r1=1406893&r2=1406894&view=diff
==============================================================================
--- river/jtsk/trunk/src/org/apache/river/impl/net/UriString.java (original)
+++ river/jtsk/trunk/src/org/apache/river/impl/net/UriString.java Thu Nov  8 
02:02:43 2012
@@ -430,7 +430,7 @@ public class UriString {
          */
         String authority = uri.getAuthority();
         String path = uri.getPath();
-        if (path != null || !path.equals("") ){
+        if (path != null && !path.equals("") ){
             if (authority != null){
                 if ( !path.startsWith("/")) path = '/' + path;
             } else {