svn commit: r1817749 - in /ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container: CrossSubdomainSessionValve.java FilterJars.java

[mbrohl]

Author: mbrohl
Date: Mon Dec 11 07:49:49 2017
New Revision: 1817749

URL: http://svn.apache.org/viewvc?rev=1817749&view=rev
Log:
Improved: General refactoring and code improvements, package 
org.apache.ofbiz.catalina.container.
(OFBIZ-9871)

Thanks Dennis Balkir for reporting and providing the patches.

Modified:
    
ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java
    
ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/FilterJars.java

Modified: 
ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java?rev=1817749&r1=1817748&r2=1817749&view=diff
==============================================================================
--- 
ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java
 Mon Dec 11 07:49:49 2017
@@ -80,7 +80,9 @@ public class CrossSubdomainSessionValve
                         break;
                     }
                 }
-                if (isIpAddress) return;
+                if (isIpAddress) {
+                    return;
+                }
             }
             if (domainArray.length > 2) {
                 cookieDomain = "." + domainArray[domainArray.length - 2] + "." 
+ domainArray[domainArray.length - 1];

Modified: 
ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/FilterJars.java
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/FilterJars.java?rev=1817749&r1=1817748&r2=1817749&view=diff
==============================================================================
--- 
ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/FilterJars.java
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/FilterJars.java
 Mon Dec 11 07:49:49 2017
@@ -27,5 +27,5 @@ final class FilterJars implements JarSca
     @Override
     public boolean check(final JarScanType jarScanType, final String jarName) {
         return UtilProperties.getPropertyAsBoolean("catalina", "webSocket", 
false) ? jarName.contains("ofbiz.jar") : false;
-    } 
+    }
 }