Handle default package properly in deployment config (#12461).

Change-Id: Ied046a49c4e3046011658dd77963972ea1e9e806

1 files changed, 13 insertions, 4 deletions

diff --git a/server/src/com/vaadin/server/DefaultDeploymentConfiguration.java b/server/src/com/vaadin/server/DefaultDeploymentConfiguration.java
index 519d81eb6d..b2a66ee2a9 100644
--- a/server/src/com/vaadin/server/DefaultDeploymentConfiguration.java
+++ b/server/src/com/vaadin/server/DefaultDeploymentConfiguration.java
@@ -142,16 +142,25 @@ public class DefaultDeploymentConfiguration implements DeploymentConfiguration {
             pkgName = pkg.getName();
         } else {
             final String className = systemPropertyBaseClass.getName();
-            pkgName = new String(className.toCharArray(), 0,
-                    className.lastIndexOf('.'));
+            int index = className.lastIndexOf('.');
+            if (index >= 0) {
+                pkgName = className.substring(0, index);
+            } else {
+                pkgName = null;
+            }
+        }
+        if (pkgName == null) {
+            pkgName = "";
+        } else {
+            pkgName += '.';
         }
-        val = System.getProperty(pkgName + "." + parameterName);
+        val = System.getProperty(pkgName + parameterName);
         if (val != null) {
             return val;
         }
 
         // Try lowercased system properties
-        val = System.getProperty(pkgName + "." + parameterName.toLowerCase());
+        val = System.getProperty(pkgName + parameterName.toLowerCase());
         return val;
     }