Author: vishwanathk
Date: Sun Sep 9 13:47:56 2012
New Revision: 1382501
URL: http://svn.apache.org/viewvc?rev=1382501&view=rev
Log:
TOMEE-410 Add a trim before converting String to Integer to prevent NFE
Added:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/servlet/SimpleServletLoadOnStartupTest.java
(with props)
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/servlet/
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/servlet/web.xml
(with props)
Modified:
openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/LoadOnStartupAdapter.java
Added:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/servlet/SimpleServletLoadOnStartupTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/servlet/SimpleServletLoadOnStartupTest.java?rev=1382501&view=auto
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/servlet/SimpleServletLoadOnStartupTest.java
(added)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/servlet/SimpleServletLoadOnStartupTest.java
Sun Sep 9 13:47:56 2012
@@ -0,0 +1,47 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.openejb.arquillian.tests.servlet;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(Arquillian.class)
+public class SimpleServletLoadOnStartupTest {
+
+
+
+
+ @Deployment(testable = false)
+ public static WebArchive getArchive() {
+ return ShrinkWrap.create(WebArchive.class,"test-loadonStartup.war")
+ .addAsWebInfResource(new ClassLoaderAsset(
+
SimpleServletLoadOnStartupTest.class.getPackage().getName().replace('.',
'/').concat("/").concat("web.xml")), "web.xml");
+
+ }
+
+ @Test
+ public void testDeployment()
+ {
+ // should succeed without errors for load-on-startup value with
leading/trailing space
+ }
+
+}
Propchange:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/servlet/SimpleServletLoadOnStartupTest.java
------------------------------------------------------------------------------
svn:executable = *
Added:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/servlet/web.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/servlet/web.xml?rev=1382501&view=auto
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/servlet/web.xml
(added)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/servlet/web.xml
Sun Sep 9 13:47:56 2012
@@ -0,0 +1,18 @@
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
+
+ <servlet>
+ <display-name>Servlet1</display-name>
+ <servlet-name>Servlet1</servlet-name>
+
<servlet-class>org.apache.openejb.arquillian.tests.servlet.SimpleServlet</servlet-class>
+ <load-on-startup> 1 </load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Servlet1</servlet-name>
+ <url-pattern>/Servlet1</url-pattern>
+ </servlet-mapping>
+
+ </web-app>
Propchange:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/servlet/web.xml
------------------------------------------------------------------------------
svn:executable = *
Modified:
openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/LoadOnStartupAdapter.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/LoadOnStartupAdapter.java?rev=1382501&r1=1382500&r2=1382501&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/LoadOnStartupAdapter.java
(original)
+++
openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/LoadOnStartupAdapter.java
Sun Sep 9 13:47:56 2012
@@ -34,7 +34,7 @@ public class LoadOnStartupAdapter extend
if (value.equalsIgnoreCase("false")) {
return null;
}
- return Integer.valueOf(value);
+ return Integer.valueOf(value.trim());
}
@Override
