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

[solomax]

Author: solomax
Date: Thu Feb 23 16:38:06 2017
New Revision: 1784169

URL: http://svn.apache.org/viewvc?rev=1784169&view=rev
Log:
no jira: code clean-up

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

Modified: 
openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java?rev=1784169&r1=1784168&r2=1784169&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java
 (original)
+++ 
openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java
 Thu Feb 23 16:38:06 2017
@@ -65,8 +65,8 @@ public class StoredFile {
                ext.addAll(convertExtensions);
                ext.addAll(pdfExtensions);
                ext.addAll(chartExtensions);
-               StringBuilder sb = new 
StringBuilder("audio/*,video/*,image/*,.");
-               sb.append(String.join("|.", ext));
+               StringBuilder sb = new StringBuilder("audio/*,video/*,image/*");
+               sb.append(String.join(",.", ext));
                return sb.toString();
        }
 

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=1784169&r1=1784168&r2=1784169&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 Feb 23 16:38:06 2017
@@ -39,7 +39,7 @@ public class ExtendedClientProperties ex
 
        public JSONObject getSettings() {
                try {
-                       return new JSONObject(settings.toString());
+                       return settings == null ? new JSONObject() : new 
JSONObject(settings.toString());
                } catch (Exception e) {
                        //can throw, no op
                }

Modified: 
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java?rev=1784169&r1=1784168&r2=1784169&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java
 Thu Feb 23 16:38:06 2017
@@ -65,8 +65,8 @@ public class StoredFile {
                ext.addAll(convertExtensions);
                ext.addAll(pdfExtensions);
                ext.addAll(chartExtensions);
-               StringBuilder sb = new 
StringBuilder("audio/*,video/*,image/*,.");
-               sb.append(String.join("|.", ext));
+               StringBuilder sb = new StringBuilder("audio/*,video/*,image/*");
+               sb.append(String.join(",.", ext));
                return sb.toString();
        }
 

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=1784169&r1=1784168&r2=1784169&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 Feb 23 16:38:06 2017
@@ -39,7 +39,7 @@ public class ExtendedClientProperties ex
 
        public JSONObject getSettings() {
                try {
-                       return new JSONObject(settings.toString());
+                       return settings == null ? new JSONObject() : new 
JSONObject(settings.toString());
                } catch (Exception e) {
                        //can throw, no op
                }