svn commit: r1786093 - in /openmeetings/application: branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/

[solomax]

Author: solomax
Date: Thu Mar  9 03:06:32 2017
New Revision: 1786093

URL: http://svn.apache.org/viewvc?rev=1786093&view=rev
Log:
[OPENMEETINGS-1594] screen-sharing base url shoul be fixed

Modified:
    
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
    
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java

Modified: 
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java?rev=1786093&r1=1786092&r2=1786093&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
 (original)
+++ 
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
 Thu Mar  9 03:06:32 2017
@@ -53,22 +53,26 @@ public class ExtendedClientProperties ex
                return new JSONObject();
        }
 
-       private static StringBuilder cleanUrl(StringBuilder sb, String _url) {
+       private static StringBuilder cleanUrl(String _url) {
+               StringBuilder sb = new StringBuilder();
+               int semi = _url.indexOf(';');
+               if (semi > -1) {
+                       _url = _url.substring(0, semi);
+               }
                for (String tail : new String[]{HASH_MAPPING, SIGNIN_MAPPING, 
NOTINIT_MAPPING}) {
                        if (_url.endsWith(tail)) {
-                               sb.setLength(_url.length() - tail.length());
+                               _url = _url.substring(0, _url.length() - 
tail.length());
                                break;
                        }
                }
-               return sb;
+               return sb.append(_url);
        }
 
        @Override
        public void read(IRequestParameters parameters) {
                super.read(parameters);
                String _url = 
parameters.getParameterValue("codebase").toString("N/A");
-               StringBuilder sb = new StringBuilder(_url);
-               cleanUrl(sb, _url);
+               StringBuilder sb = cleanUrl(_url);
                if (sb.charAt(sb.length() - 1) != '/') {
                        sb.append('/');
                }

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java?rev=1786093&r1=1786092&r2=1786093&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
 Thu Mar  9 03:06:32 2017
@@ -53,22 +53,26 @@ public class ExtendedClientProperties ex
                return new JSONObject();
        }
 
-       private static StringBuilder cleanUrl(StringBuilder sb, String _url) {
+       private static StringBuilder cleanUrl(String _url) {
+               StringBuilder sb = new StringBuilder();
+               int semi = _url.indexOf(';');
+               if (semi > -1) {
+                       _url = _url.substring(0, semi);
+               }
                for (String tail : new String[]{HASH_MAPPING, SIGNIN_MAPPING, 
NOTINIT_MAPPING}) {
                        if (_url.endsWith(tail)) {
-                               sb.setLength(_url.length() - tail.length());
+                               _url = _url.substring(0, _url.length() - 
tail.length());
                                break;
                        }
                }
-               return sb;
+               return sb.append(_url);
        }
 
        @Override
        public void read(IRequestParameters parameters) {
                super.read(parameters);
                String _url = 
parameters.getParameterValue("codebase").toString("N/A");
-               StringBuilder sb = new StringBuilder(_url);
-               cleanUrl(sb, _url);
+               StringBuilder sb = cleanUrl(_url);
                if (sb.charAt(sb.length() - 1) != '/') {
                        sb.append('/');
                }