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

Change-Id: Ied046a49c4e3046011658dd77963972ea1e9e806

3 files changed, 95 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;
     }
 
diff --git a/server/tests/src/ClassInDefaultPackage.java b/server/tests/src/ClassInDefaultPackage.java
new file mode 100644
index 0000000000..1eb8bc4df5
--- /dev/null
+++ b/server/tests/src/ClassInDefaultPackage.java
@@ -0,0 +1,29 @@
+import org.junit.Ignore;
+
+/*
+ * Copyright 2000-2013 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+/**
+ * 
+ * This class is test data. Don't delete it.
+ * 
+ * @author Vaadin Ltd
+ * @since 7.2
+ */
+@Ignore
+public class ClassInDefaultPackage {
+
+}
diff --git a/server/tests/src/com/vaadin/server/DefaultDeploymentConfigurationTest.java b/server/tests/src/com/vaadin/server/DefaultDeploymentConfigurationTest.java
new file mode 100644
index 0000000000..45d9853537
--- /dev/null
+++ b/server/tests/src/com/vaadin/server/DefaultDeploymentConfigurationTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2000-2013 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.server;
+
+import java.util.Properties;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Tests for {@link DefaultDeploymentConfiguration}
+ * 
+ * @author Vaadin Ltd
+ * @since 7.2
+ */
+public class DefaultDeploymentConfigurationTest {
+
+    @Test
+    public void testGetSystemPropertyForDefaultPackage()
+            throws ClassNotFoundException {
+        Class<?> clazz = Class.forName("ClassInDefaultPackage");
+        String value = "value";
+        String prop = "prop";
+        System.setProperty(prop, value);
+        DefaultDeploymentConfiguration config = new DefaultDeploymentConfiguration(
+                clazz, new Properties());
+        Assert.assertEquals(value, config.getSystemProperty(prop));
+    }
+
+    @Test
+    public void testGetSystemProperty() throws ClassNotFoundException {
+        String value = "value";
+        String prop = "prop";
+        System.setProperty(DefaultDeploymentConfigurationTest.class
+                .getPackage().getName() + '.' + prop, value);
+        DefaultDeploymentConfiguration config = new DefaultDeploymentConfiguration(
+                DefaultDeploymentConfigurationTest.class, new Properties());
+        Assert.assertEquals(value, config.getSystemProperty(prop));
+    }
+}