date:20130103

[Bug 54320] Regression: can not activate activate directory listings parameter for DefaultServlet STRICT_SERVLET_COMPLIANCE

2013-01-03 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=54320

--- Comment #4 from Cédrik LIME  ---
Thanks for the heads up, Violeta!

Strangely enough, specifying "resourceOnlyServlets=jsp" is enough, even though
it is the DefaultServlet that is serving the listing.

As this is a new behaviour for Tomcat 7, it might be worth to add a note in the
the documentation and/or conf/web.xml's DefaultServlet comments.

Regards,
Cédrik

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Tomcat Wiki] Update of "TomcatVersions" by markt

2013-01-03 Thread Apache Wiki

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "TomcatVersions" page has been changed by markt:
http://wiki.apache.org/tomcat/TomcatVersions?action=diff&rev1=16&rev2=17

  = Tomcat 5.5.x =
  ||Spec versions: ||Servlet 2.4, JSP 2.0 ||
  ||Stable: ||Yes ||
- ||Enhancements: ||Unlikely ||
+ ||Enhancements: ||Highly unlikely ||
- ||Bug Fixes: ||Yes ||
+ ||Bug Fixes: ||Highly unlikely ||
- ||Security Fixes: ||Yes ||
+ ||Security Fixes: ||Highly unlikely ||
- ||Releases: ||Yes ||
+ ||Releases: ||Highly unlikely ||
  ||Release Manager: ||Filip Hanik (fhanik) ||
  ||Process: ||RTC ||
- ||Listed on download pages: ||Yes ||
+ ||Listed on download pages: ||No ||
  
  
  = Tomcat 4.1.x =
@@ -78, +78 @@

   * Tomcat 4.1.x
   * Tomcat 5.0.x
  
- 
  = RTC Exceptions =
  Via  http://markmail.org/thread/2fgydrrhn4qjye3r
  
@@ -87, +86 @@

   * Require some indication in the commit message for code that usually is 
covered by RTC, that this commit was done using C-T-R rule.
  
  
- [[CategoryFAQ|CategoryFAQ]]
+ [[CategoryFAQ]]
  

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Tomcat Wiki] Update of "TomcatVersions" by markt

2013-01-03 Thread Apache Wiki

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "TomcatVersions" page has been changed by markt:
http://wiki.apache.org/tomcat/TomcatVersions?action=diff&rev1=17&rev2=18

  = Tomcat 6.0.x =
  ||Spec versions: ||Servlet 2.5, JSP 2.1 ||
  ||Stable: ||Yes ||
- ||Enhancements: ||Yes ||
+ ||Enhancements: ||Unlikely ||
  ||Bug Fixes: ||Yes ||
  ||Security Fixes: ||Yes ||
  ||Releases: ||Yes ||

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1428283 - in /tomcat/trunk/test: org/apache/jasper/runtime/TestJspWriterImpl.java webapp-3.0/bug5nnnn/bug54241a.jsp webapp-3.0/bug5nnnn/bug54241b.jsp

2013-01-03 Thread markt

Author: markt
Date: Thu Jan  3 11:14:35 2013
New Revision: 1428283

URL: http://svn.apache.org/viewvc?rev=1428283&view=rev
Log:
Line endings

Modified:
tomcat/trunk/test/org/apache/jasper/runtime/TestJspWriterImpl.java   
(contents, props changed)
tomcat/trunk/test/webapp-3.0/bug5/bug54241a.jsp   (contents, props 
changed)
tomcat/trunk/test/webapp-3.0/bug5/bug54241b.jsp   (contents, props 
changed)

Modified: tomcat/trunk/test/org/apache/jasper/runtime/TestJspWriterImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/runtime/TestJspWriterImpl.java?rev=1428283&r1=1428282&r2=1428283&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/runtime/TestJspWriterImpl.java 
(original)
+++ tomcat/trunk/test/org/apache/jasper/runtime/TestJspWriterImpl.java Thu Jan  
3 11:14:35 2013
@@ -1,70 +1,70 @@
-/*
- * 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.jasper.runtime;
-
-import java.io.File;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import org.apache.catalina.startup.Tomcat;
-import org.apache.catalina.startup.TomcatBaseTest;
-import org.apache.tomcat.util.buf.ByteChunk;
-
-public class TestJspWriterImpl extends TomcatBaseTest {
-
-@Test
-public void bug54241a() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-File appDir = new File("test/webapp-3.0");
-tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-
-tomcat.start();
-
-ByteChunk res = new ByteChunk();
-
-int rc = getUrl("http://localhost:"; + getPort() +
-"/test/bug5/bug54241a.jsp", res, null);
-
-Assert.assertEquals(HttpServletResponse.SC_OK, rc);
-
-String body = res.toString();
-Assert.assertTrue(body.contains("01: null"));
-Assert.assertTrue(body.contains("02: null"));
-}
-
-@Test
-public void bug54241b() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-File appDir = new File("test/webapp-3.0");
-tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-
-tomcat.start();
-
-ByteChunk res = new ByteChunk();
-
-int rc = getUrl("http://localhost:"; + getPort() +
-"/test/bug5/bug54241b.jsp", res, null);
-
-Assert.assertEquals(res.toString(),
-HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
-}
-}
+/*
+ * 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.jasper.runtime;
+
+import java.io.File;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+public class TestJspWriterImpl extends TomcatBaseTest {
+
+@Test
+public void bug54241a() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = new File("test/webapp-3.0");
+tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+
+tomcat.start();
+
+ByteChunk res = new ByteChunk();
+
+int rc = getUrl("http://localhost:"; + getPort() +
+"/test/bug5/bug54241a.jsp", res, null);
+
+Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+
+String body = res.t

svn commit: r1428284 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/jasper/runtime/TestJspWriterImpl.java test/webapp-3.0/bug5nnnn/bug54241a.jsp test/webapp-3.0/bug5nnnn/bug54241b.jsp

2013-01-03 Thread markt

Author: markt
Date: Thu Jan  3 11:15:17 2013
New Revision: 1428284

URL: http://svn.apache.org/viewvc?rev=1428284&view=rev
Log:
Line endings

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/jasper/runtime/TestJspWriterImpl.java  
 (contents, props changed)
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug54241a.jsp   (contents, 
props changed)
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug54241b.jsp   (contents, 
props changed)

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1428283

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/jasper/runtime/TestJspWriterImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/jasper/runtime/TestJspWriterImpl.java?rev=1428284&r1=1428283&r2=1428284&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/jasper/runtime/TestJspWriterImpl.java 
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/jasper/runtime/TestJspWriterImpl.java 
Thu Jan  3 11:15:17 2013
@@ -1,70 +1,70 @@
-/*
- * 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.jasper.runtime;
-
-import java.io.File;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import org.apache.catalina.startup.Tomcat;
-import org.apache.catalina.startup.TomcatBaseTest;
-import org.apache.tomcat.util.buf.ByteChunk;
-
-public class TestJspWriterImpl extends TomcatBaseTest {
-
-@Test
-public void bug54241a() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-File appDir = new File("test/webapp-3.0");
-tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-
-tomcat.start();
-
-ByteChunk res = new ByteChunk();
-
-int rc = getUrl("http://localhost:"; + getPort() +
-"/test/bug5/bug54241a.jsp", res, null);
-
-Assert.assertEquals(HttpServletResponse.SC_OK, rc);
-
-String body = res.toString();
-Assert.assertTrue(body.contains("01: null"));
-Assert.assertTrue(body.contains("02: null"));
-}
-
-@Test
-public void bug54241b() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-File appDir = new File("test/webapp-3.0");
-tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-
-tomcat.start();
-
-ByteChunk res = new ByteChunk();
-
-int rc = getUrl("http://localhost:"; + getPort() +
-"/test/bug5/bug54241b.jsp", res, null);
-
-Assert.assertEquals(res.toString(),
-HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
-}
-}
+/*
+ * 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.jasper.runtime;
+
+import java.io.File;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+public class TestJspWriterImpl extends TomcatBaseTest {
+
+@Test
+public void bug54241a() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = new File("test/webapp-3.0");
+tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+
+tomcat.start();
+
+By

[Bug 54368] New: Default in compiling

2013-01-03 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=54368

Bug ID: 54368
   Summary: Default in compiling
   Product: Tomcat 6
   Version: unspecified
  Hardware: PC
OS: Windows XP
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
  Assignee: dev@tomcat.apache.org
  Reporter: ramanpreet.tag...@gmail.com
Classification: Unclassified

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 54369] New: Default in compiling

2013-01-03 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=54369

Bug ID: 54369
   Summary: Default in compiling
   Product: Tomcat 6
   Version: unspecified
  Hardware: PC
OS: Windows XP
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
  Assignee: dev@tomcat.apache.org
  Reporter: ramanpreet.tag...@gmail.com
Classification: Unclassified

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 54369] Default in compiling

2013-01-03 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=54369

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |INVALID

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 54368] Default in compiling

2013-01-03 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=54368

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |INVALID

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1428355 - /tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java

2013-01-03 Thread markt

Author: markt
Date: Thu Jan  3 14:18:01 2013
New Revision: 1428355

URL: http://svn.apache.org/viewvc?rev=1428355&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54260
Avoid NPE when using JSP unloading and tag files.

Modified:
tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java

Modified: tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java?rev=1428355&r1=1428354&r2=1428355&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java (original)
+++ tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java Thu Jan  3 
14:18:01 2013
@@ -174,7 +174,7 @@ public class FastRemovalDequeue {
  * Removes any element of the list and returns its content.
  **/
 public synchronized void remove(final Entry element) {
-if (!element.getValid()) {
+if (element == null || !element.getValid()) {
 return;
 }
 Entry next = element.getNext();



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1428358 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/util/FastRemovalDequeue.java webapps/docs/changelog.xml

2013-01-03 Thread markt

Author: markt
Date: Thu Jan  3 14:19:55 2013
New Revision: 1428358

URL: http://svn.apache.org/viewvc?rev=1428358&view=rev
Log:
Avoid NPE when using JSP unloading and tag files.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1428355

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java?rev=1428358&r1=1428357&r2=1428358&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java 
Thu Jan  3 14:19:55 2013
@@ -174,7 +174,7 @@ public class FastRemovalDequeue {
  * Removes any element of the list and returns its content.
  **/
 public synchronized void remove(final Entry element) {
-if (!element.getValid()) {
+if (element == null || !element.getValid()) {
 return;
 }
 Entry next = element.getNext();

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1428358&r1=1428357&r2=1428358&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jan  3 14:19:55 2013
@@ -88,6 +88,10 @@
 ForEach tag plug-in implementation. Patch provided by Sheldon Shao.
 (markt)
   
+  
+54260: Avoid NullPointerException when using
+JSP unloading and tag files. (markt)  
+  
 
   
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 54260] JSP unloading - NullPointerException when using ".tag" files

2013-01-03 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=54260

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #2 from Mark Thomas  ---
Thanks for the report and the easy to reproduce test case.

The problem has been fixed in trunk and 7.0.x and will be included in 7.0.35
onwards.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 54370] New: NPE mapping method in EL

2013-01-03 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=54370

Bug ID: 54370
   Summary: NPE mapping method in EL
   Product: Tomcat 7
   Version: trunk
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
  Assignee: dev@tomcat.apache.org
  Reporter: r...@apache.org
Classification: Unclassified

Created attachment 29808
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=29808&action=edit
Patch

NPE when using null parameters in some cases:
https://issues.jboss.org/browse/AS7-3177

I did put a workaround for it, but I don't know how legitimate it is. It looks
a bit similar to the NPE with a null toString that got reverted, where a null
object is used as an argument.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 54370] NPE mapping method in EL

2013-01-03 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=54370

--- Comment #1 from Mark Thomas  ---
I think you have identified a problem but I'm not sure the proposed solution is
correct. Treating a null as an exact match for a parameter seems wrong. I think
it needs to be treated as a possible match. I'll work on some test cases.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Question about bug 54284

2013-01-03 Thread Mark Thomas

On 03/01/2013 14:30, Violeta Georgieva wrote:

> I think that when the filter name is NULL the proper behaviour is to return
> IllegalArgumentException.
> From other point of view the method's javadoc specifies only
> IllegalStateException and UnsupportedOperationException.
> If the method starts returning IllegalArgumentException it will be
> backwards incompatible change and also not compliant with the specification.
> 
> What do you think?

I think that there is strong implication from the Javadoc that the name
is required. That said, when using this API a name isn't absolutely
necessary so it could be made optional (ignoring the JMX name issues).

IllegalArgumentException is a runtime exception so as long as it is not
added to the method signature (it doesn't need to be) that will not
break the API tests in the TCK.

> Are there any clarifications in the Servlet 3.1 specification?

Not that I am aware of. I'd suggest creating a Jira issue and requesting
clarification. I usually find to helpful to suggest a solution in the
Jira which in this case I think is that the name should be required.

The issue can be left in the NEEDINFO state with a link to the Servlet
Jira until we get clarification.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 54370] NPE mapping method in EL

2013-01-03 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=54370

--- Comment #2 from Remy Maucherat  ---
(In reply to comment #1)
> I think you have identified a problem but I'm not sure the proposed solution
> is correct. Treating a null as an exact match for a parameter seems wrong. I
> think it needs to be treated as a possible match. I'll work on some test
> cases.

I think it is suspicious too [like many one line patches], but even if it goes
through ELSupport.coerceToType, I think null looks like it will always end up
matching the expected type (unless I missed something).

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

buildbot failure in ASF Buildbot on tomcat-7-trunk

2013-01-03 Thread buildbot

The Buildbot has detected a new failure on builder tomcat-7-trunk while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-7-trunk/builds/974

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1428358
Blamelist: markt

BUILD FAILED: failed compile_1

sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1428403 - in /tomcat/trunk: java/org/apache/el/util/ReflectionUtil.java test/org/apache/el/util/ test/org/apache/el/util/TestReflectionUtil.java test/org/apache/el/util/Tester.java

2013-01-03 Thread markt

Author: markt
Date: Thu Jan  3 15:38:00 2013
New Revision: 1428403

URL: http://svn.apache.org/viewvc?rev=1428403&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54370
Improve handling of nulls when trying to match sets of parameters to a method 
in EL.

Added:
tomcat/trunk/test/org/apache/el/util/
tomcat/trunk/test/org/apache/el/util/TestReflectionUtil.java   (with props)
tomcat/trunk/test/org/apache/el/util/Tester.java   (with props)
Modified:
tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java

Modified: tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java?rev=1428403&r1=1428402&r2=1428403&view=diff
==
--- tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java (original)
+++ tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java Thu Jan  3 
15:38:00 2013
@@ -250,7 +250,6 @@ public class ReflectionUtil {
 return match;
 }
 
-@SuppressWarnings("null")
 private static Method resolveAmbiguousMethod(Set candidates,
 Class[] paramTypes) {
 // Identify which parameter isn't an exact match
@@ -267,6 +266,11 @@ public class ReflectionUtil {
 }
 }
 
+if (nonMatchClass == null) {
+// Null will always be ambiguous
+return null;
+}
+
 for (Method c : candidates) {
if (c.getParameterTypes()[nonMatchIndex] ==
paramTypes[nonMatchIndex]) {
@@ -294,6 +298,12 @@ public class ReflectionUtil {
 
 // src will always be an object
 private static boolean isAssignableFrom(Class src, Class target) {
+// Short-cut. null is always assignable to an object and in EL null
+// can always be coerced to a valid value for a primitive
+if (src == null) {
+return true;
+}
+
 Class targetClass;
 if (target.isPrimitive()) {
 if (target == Boolean.TYPE) {
@@ -334,7 +344,11 @@ public class ReflectionUtil {
 if (types != null) {
 StringBuilder sb = new StringBuilder();
 for (int i = 0; i < types.length; i++) {
-sb.append(types[i].getName()).append(", ");
+if (types[i] == null) {
+sb.append("null, ");
+} else {
+sb.append(types[i].getName()).append(", ");
+}
 }
 if (sb.length() > 2) {
 sb.setLength(sb.length() - 2);

Added: tomcat/trunk/test/org/apache/el/util/TestReflectionUtil.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/util/TestReflectionUtil.java?rev=1428403&view=auto
==
--- tomcat/trunk/test/org/apache/el/util/TestReflectionUtil.java (added)
+++ tomcat/trunk/test/org/apache/el/util/TestReflectionUtil.java Thu Jan  3 
15:38:00 2013
@@ -0,0 +1,63 @@
+/*
+ * 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.el.util;
+
+import javax.el.MethodNotFoundException;
+
+import org.junit.Test;
+
+public class TestReflectionUtil {
+
+private static final Tester BASE = new Tester();
+
+/*
+ * Expect failure as it is not possible to identify which method named
+ * "testA()" is intended.
+ */
+@Test(expected=MethodNotFoundException.class)
+public void testBug54370a() {
+ReflectionUtil.getMethod(BASE, "testA",
+new Class[] {null, String.class},
+new Object[] {null, ""});
+}
+
+/*
+ * Expect failure as it is not possible to identify which method named
+ * "testB()" is intended. Note: In EL null can always be coerced to a valid
+ * value for a primative.
+ */
+@Test(expected=MethodNotFoundException.class)
+public void testBug54370b() {
+ReflectionUtil.getMethod(BASE, "testB",
+new Class[] {null, String.class},
+new Object[] {null, ""});
+}
+
+@Test
+public void testBug54370c() {
+ReflectionUtil.getMethod(BASE, "testC",
+

svn commit: r1428408 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/el/util/ReflectionUtil.java test/org/apache/el/util/ webapps/docs/changelog.xml

2013-01-03 Thread markt

Author: markt
Date: Thu Jan  3 15:39:41 2013
New Revision: 1428408

URL: http://svn.apache.org/viewvc?rev=1428408&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54370
Improve handling of nulls when trying to match sets of parameters to a method 
in EL.

Added:
tomcat/tc7.0.x/trunk/test/org/apache/el/util/
  - copied from r1428403, tomcat/trunk/test/org/apache/el/util/
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/el/util/ReflectionUtil.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1428403

Modified: tomcat/tc7.0.x/trunk/java/org/apache/el/util/ReflectionUtil.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/el/util/ReflectionUtil.java?rev=1428408&r1=1428407&r2=1428408&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/el/util/ReflectionUtil.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/el/util/ReflectionUtil.java Thu Jan  3 
15:39:41 2013
@@ -250,7 +250,6 @@ public class ReflectionUtil {
 return match;
 }
 
-@SuppressWarnings("null")
 private static Method resolveAmbiguousMethod(Set candidates,
 Class[] paramTypes) {
 // Identify which parameter isn't an exact match
@@ -267,6 +266,11 @@ public class ReflectionUtil {
 }
 }
 
+if (nonMatchClass == null) {
+// Null will always be ambiguous
+return null;
+}
+
 for (Method c : candidates) {
if (c.getParameterTypes()[nonMatchIndex] ==
paramTypes[nonMatchIndex]) {
@@ -294,6 +298,12 @@ public class ReflectionUtil {
 
 // src will always be an object
 private static boolean isAssignableFrom(Class src, Class target) {
+// Short-cut. null is always assignable to an object and in EL null
+// can always be coerced to a valid value for a primitive
+if (src == null) {
+return true;
+}
+
 Class targetClass;
 if (target.isPrimitive()) {
 if (target == Boolean.TYPE) {
@@ -334,7 +344,11 @@ public class ReflectionUtil {
 if (types != null) {
 StringBuilder sb = new StringBuilder();
 for (int i = 0; i < types.length; i++) {
-sb.append(types[i].getName()).append(", ");
+if (types[i] == null) {
+sb.append("null, ");
+} else {
+sb.append(types[i].getName()).append(", ");
+}
 }
 if (sb.length() > 2) {
 sb.setLength(sb.length() - 2);

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1428408&r1=1428407&r2=1428408&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jan  3 15:39:41 2013
@@ -92,6 +92,10 @@
 54260: Avoid NullPointerException when using
 JSP unloading and tag files. (markt)  
   
+  
+54370: Improve handling of nulls when trying to match sets 
of
+parameters to a method in EL. (markt)
+  
 
   
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 54370] NPE mapping method in EL

2013-01-03 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=54370

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #3 from Mark Thomas  ---
It is the exact match part that is the problem. As soon as an exact match is
find, Tomcat stops looking. With a null parameter type it needs to keep looking
as it is only a possible match. Tomcat needs to ensure it is the only possible
match and that there aren't ambiguous matches.

I fixed this in trunk and 7.0.x and it will be included in 7.0.35 onwards.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

buildbot success in ASF Buildbot on tomcat-7-trunk

2013-01-03 Thread buildbot

The Buildbot has detected a restored build on builder tomcat-7-trunk while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-7-trunk/builds/975

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1428408
Blamelist: markt

Build succeeded!

sincerely,
 -The Buildbot

Re: Question about bug 54284

2013-01-03 Thread Violeta Georgieva

Thanks

2013/1/3 Mark Thomas 

> On 03/01/2013 14:30, Violeta Georgieva wrote:
>
> > I think that when the filter name is NULL the proper behaviour is to
> return
> > IllegalArgumentException.
> > From other point of view the method's javadoc specifies only
> > IllegalStateException and UnsupportedOperationException.
> > If the method starts returning IllegalArgumentException it will be
> > backwards incompatible change and also not compliant with the
> specification.
> >
> > What do you think?
>
> I think that there is strong implication from the Javadoc that the name
> is required. That said, when using this API a name isn't absolutely
> necessary so it could be made optional (ignoring the JMX name issues).
>
> IllegalArgumentException is a runtime exception so as long as it is not
> added to the method signature (it doesn't need to be) that will not
> break the API tests in the TCK.
>
> > Are there any clarifications in the Servlet 3.1 specification?
>
> Not that I am aware of. I'd suggest creating a Jira issue and requesting
> clarification. I usually find to helpful to suggest a solution in the
> Jira which in this case I think is that the name should be required.
>
> The issue can be left in the NEEDINFO state with a link to the Servlet
> Jira until we get clarification.
>
> Mark
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

[Bug 54284] Util.objectNameValueNeedsQuote throws NPE for anonymous Filters

2013-01-03 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=54284

Violeta Georgieva  changed:

   What|Removed |Added

 Status|NEW |NEEDINFO

--- Comment #3 from Violeta Georgieva  ---
Hi,

Servlet 3.0 javadoc does not specify what should be the behavior when
filterName is NULL.
I requested a clarification [1] from the Servlet Specification expert group.
I'm changing the status to NEEDINFO.

Regards
Violeta

[1] http://java.net/jira/browse/SERVLET_SPEC-51

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 54370] NPE mapping method in EL

2013-01-03 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=54370

--- Comment #4 from Remy Maucherat  ---
Thanks, very nice improvement.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 54371] New: java.io.FileNotFoundException while deploying web application with white space in the context root

2013-01-03 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=54371

Bug ID: 54371
   Summary: java.io.FileNotFoundException while deploying web
application with white space in the context root
   Product: Tomcat 7
   Version: trunk
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: polina.gen...@gmail.com
Classification: Unclassified

Created attachment 29809
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=29809&action=edit
Test web application.

Hello,

The following exception is thrown during web application deploy on v. Tomcat
7.0.x including the latest Tomcat 7.0.35-dev (from trunk branch):

SEVERE: Unable to process JNDI URL
[jndi:/localhost/Fragment%20Example/WEB-INF/classes/com] for annotations
java.io.FileNotFoundException:
jndi:/localhost/Fragment%20Example/WEB-INF/classes/com
at
org.apache.naming.resources.DirContextURLConnection.list(DirContextURLConnection.java:465)
at
org.apache.catalina.startup.ContextConfig.processAnnotationsJndi(ContextConfig.java:2028)
at
org.apache.catalina.startup.ContextConfig.processAnnotationsUrl(ContextConfig.java:1948)
at
org.apache.catalina.startup.ContextConfig.webConfig(ContextConfig.java:1306)
at
org.apache.catalina.startup.ContextConfig.configureStart(ContextConfig.java:878)
at
org.apache.catalina.startup.ContextConfig.lifecycleEvent(ContextConfig.java:369)
at
org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:119)
at
org.apache.catalina.util.LifecycleBase.fireLifecycleEvent(LifecycleBase.java:90)
at
org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5173)
at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:150)
at
org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:901)
at org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:877)
at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:633)
at org.apache.catalina.startup.HostConfig.deployWAR(HostConfig.java:977)
at
org.apache.catalina.startup.HostConfig$DeployWar.run(HostConfig.java:1655)
at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441)
at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
at java.util.concurrent.FutureTask.run(FutureTask.java:138)
at
java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
at java.lang.Thread.run(Thread.java:662)

To reproduce:
1.Deploy the attached application, which:
1.1.Has a white space in its name;
1.2.Includes a web fragment;
2.The web app extraction is disabled (through unpackWARs="false" Host
attribute in the server.xml)
Note that the fix for Bug 54249 should be first applied (to avoid other
exceptions prior the questioned one).

I would like to propose a small fix for this:
A substring start position is incorrectly calculated based on a string in
decoded form (e.g. “/Fragment Example”), while the substring itself is made on
an encoded string (e.g. “/localhost/Fragment%20Example/WEB-INF/classes/com”).
The proposed fix is simply to encode the string used for the calculations. 

Thanks and best regards,
Polina

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 54371] java.io.FileNotFoundException while deploying web application with white space in the context root

2013-01-03 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=54371

--- Comment #1 from polina.gen...@gmail.com ---
Created attachment 29810
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=29810&action=edit
Patch proposal.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 54262] An empty should turn off all web-fragments

2013-01-03 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=54262

--- Comment #2 from Violeta Georgieva  ---
Hi,

I'm going to work on this.

Regards
Violeta

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 54261] web-fragment.xml handling in container JARs

2013-01-03 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=54261

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WONTFIX

--- Comment #5 from Mark Thomas  ---
This is going to be very tricky to implement without changes to the JarScanner
interface. That makes it tempting to defer this until Tomcat 8.

Users that want exactly the specification defined behaviour can add the JARs to
the org.apache.catalina.startup.ContextConfig.jarsToSkip

Scanning for SCIs in container JARs is only implied and then in terms of an SCI
for JSP functionality. Tomcat doesn't (yet) use an SCI in this case. If it did,
we could hard-code the addition of that SCI and not rely on scanning anyway.

CATALINA_BASE/lib is the combined common/server/shared class loader. JARs in
the shared loader are *meant* to be treated as if they are part of the web app
(Tomcat specific extension).

Given all of the above, I am going to mark this as WONTFIX.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 54314] Code generation of TagPlugins: When and Otherwise error when they are used without outside

2013-01-03 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=54314

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |INVALID

--- Comment #7 from Mark Thomas  ---
The page is invalid. When and Otherwise are required to have Choose as an
immediate parent. If the JSTL implementation doesn't enforce that then that
isn't Tomcat's problem.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 54315] Redeploying webapp causes NullPointerException in managerBase

2013-01-03 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=54315

--- Comment #3 from Mark Thomas  ---
I'm still not exactly sure what is going on here but it looks like something is
going wrong with the undeploy. There have been some fixes related to failed
undeploys since 7.0.29 so it would be helpful if you could test with 7.0.34. In
the meantime, I'll keep digging.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1428643 - in /tomcat/trunk/java/org/apache/catalina/core: ApplicationFilterConfig.java LocalStrings.properties

2013-01-03 Thread markt

Author: markt
Date: Thu Jan  3 22:24:27 2013
New Revision: 1428643

URL: http://svn.apache.org/viewvc?rev=1428643&view=rev
Log:
Stop broken filters breaking things on application stop.

Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java?rev=1428643&r1=1428642&r2=1428643&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java Thu 
Jan  3 22:24:27 2013
@@ -309,7 +309,15 @@ public final class ApplicationFilterConf
 }
 SecurityUtil.remove(filter);
 } else {
-filter.destroy();
+try {
+filter.destroy();
+} catch (Throwable t) {
+ExceptionUtils.handleThrowable(t);
+context.getLogger().error(sm.getString(
+"applicationFilterConfig.release",
+filterDef.getFilterName(),
+filterDef.getFilterClass()), t);
+}
 }
 if (!context.getIgnoreAnnotations()) {
 try {

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1428643&r1=1428642&r2=1428643&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Thu Jan  
3 22:24:27 2013
@@ -41,6 +41,7 @@ applicationDispatcher.specViolation.resp
 applicationFilterConfig.jmxRegisterFail=JMX registration failed for filter of 
type [{0}] and name [{1}]
 applicationFilterConfig.jmxUnregister=JMX de-registration complete for filter 
of type [{0}] and name [{1}]
 applicationFilterConfig.jmxUnregisterFail=JMX de-registration failed for 
filter of type [{0}] and name [{1}]
+applicationFilterConfig.release=Failed to destroy the filter named [{0}] of 
type [{1}]
 applicationFilterRegistration.nullInitParam=Unable to set initialisation 
parameter for filter due to null name and/or value. Name [{0}], Value [{1}]
 applicationFilterRegistration.nullInitParams=Unable to set initialisation 
parameters for filter due to null name and/or value. Name [{0}], Value [{1}]
 applicationServletRegistration.setServletSecurity.iae=Null constraint 
specified for servlet [{0}] deployed to context with name [{1}]



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1428645 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationFilterConfig.java java/org/apache/catalina/core/LocalStrings.properties webapps/docs/changelog.xml

2013-01-03 Thread markt

Author: markt
Date: Thu Jan  3 22:26:10 2013
New Revision: 1428645

URL: http://svn.apache.org/viewvc?rev=1428645&view=rev
Log:
Stop broken filters breaking things on application stop.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1428643

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java?rev=1428645&r1=1428644&r2=1428645&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java 
Thu Jan  3 22:26:10 2013
@@ -309,7 +309,15 @@ public final class ApplicationFilterConf
 }
 SecurityUtil.remove(filter);
 } else {
-filter.destroy();
+try {
+filter.destroy();
+} catch (Throwable t) {
+ExceptionUtils.handleThrowable(t);
+context.getLogger().error(sm.getString(
+"applicationFilterConfig.release",
+filterDef.getFilterName(),
+filterDef.getFilterClass()), t);
+}
 }
 if (!context.getIgnoreAnnotations()) {
 try {

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1428645&r1=1428644&r2=1428645&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties 
Thu Jan  3 22:26:10 2013
@@ -44,6 +44,7 @@ applicationDispatcher.specViolation.resp
 applicationFilterConfig.jmxRegisterFail=JMX registration failed for filter of 
type [{0}] and name [{1}]
 applicationFilterConfig.jmxUnregister=JMX de-registration complete for filter 
of type [{0}] and name [{1}]
 applicationFilterConfig.jmxUnregisterFail=JMX de-registration failed for 
filter of type [{0}] and name [{1}]
+applicationFilterConfig.release=Failed to destroy the filter named [{0}] of 
type [{1}]
 applicationFilterRegistration.nullInitParam=Unable to set initialisation 
parameter for filter due to null name and/or value. Name [{0}], Value [{1}]
 applicationFilterRegistration.nullInitParams=Unable to set initialisation 
parameters for filter due to null name and/or value. Name [{0}], Value [{1}]
 applicationRequest.badParent=Cannot locate parent Request implementation

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1428645&r1=1428644&r2=1428645&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jan  3 22:26:10 2013
@@ -70,6 +70,10 @@
 extension validation by including the name of the JAR file in the
 exception. (markt)
   
+  
+Allow web applications to be stopped cleanly even if filters shown
+exceptions when their destroy() method is called. (markt)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 54315] Redeploying webapp causes NullPointerException in managerBase

2013-01-03 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=54315

--- Comment #4 from Mark Thomas  ---
I've found and fixed one place where undeploy could go wrong (filters throwing
exceptions on destroy) and I have fixed that in trunk and 7.0.x for 7.0.35.

I'm not sure that is what is going on here though although it is probably
something very like that. I'd expect to see something in the logs during the
undeploy to indicate what has gone wrong.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 54315] Redeploying webapp causes NullPointerException in managerBase

2013-01-03 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=54315

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |NEEDINFO

--- Comment #5 from Mark Thomas  ---
We need to track what is going on. Please add the following to you
logging.properties and then provide the section of the logs that shows the
undeploy/deploy when the error occurs.

org.apache.catalina.util.LifecycleBase.level = FINE

Note: This will slow down Tomcat start and stop but it should have minimal
impact on normal running.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GUMP@vmgump]: Project tomcat-tc7.0.x-validate-eoln (in module tomcat-7.0.x) failed

2013-01-03 Thread Bill Barker

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-tc7.0.x-validate-eoln has an issue affecting its community 
integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc7.0.x-validate-eoln :  Tomcat 7.x, a web server implementing 
Java Servlet 3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate-eoln/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate-eoln/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-validate-eoln.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-validate-eoln (Type: Build)
Work ended in a state of : Failed
Elapsed: 20 secs
Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml validate-eoln 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/classes:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-7.0.x/build.xml

build-prepare:
[mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/classes
[mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/build
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-7.0.x/output/build/conf
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-7.0.x/output/build/logs
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-7.0.x/output/build/temp
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps

compile-prepare:
 [copy] Copying 1 file to 
/srv/gump/public/workspace/tomcat-7.0.x/java/org/apache/catalina/startup
 [copy] Copying 1 file to 
/srv/gump/public/workspace/tomcat-7.0.x/webapps/docs

validate-eoln:
[javac] Compiling 1 source file to 
/srv/gump/public/workspace/tomcat-7.0.x/output/classes
 [checkeol] Checking line ends in 2249 file(s)
 [checkeol] Checking line ends in 84 file(s)
 [checkeol] Done line ends check in 2333 file(s), 1 error(s) found.
 [checkeol] The following files have wrong line ends: [
 [checkeol] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/el/util/Tester.java: 
uses CRLF on line 1]

BUILD FAILED
/srv/gump/public/workspace/tomcat-7.0.x/build.xml:522: The following files have 
wrong line ends: [
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/el/util/Tester.java: 
uses CRLF on line 1]

Total time: 20 seconds
-

To subscribe to this information via syndicated feeds:
- RSS: 
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate-eoln/rss.xml
- Atom: 
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate-eoln/atom.xml

== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 1404012013, vmgump.apache.org:vmgump:1404012013
Gump E-mail Identifier (unique within run) #15.

--
Apache Gump
http://gump.apache.org/ [Instance: vmgump]

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GUMP@vmgump]: Project tomcat-trunk-validate-eoln (in module tomcat-trunk) failed

2013-01-03 Thread Bill Barker

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-validate-eoln has an issue affecting its community 
integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-validate-eoln :  Tomcat 8.x, a web server implementing Java 
Servlet 3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate-eoln/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate-eoln/gump_work/build_tomcat-trunk_tomcat-trunk-validate-eoln.html
Work Name: build_tomcat-trunk_tomcat-trunk-validate-eoln (Type: Build)
Work ended in a state of : Failed
Elapsed: 27 secs
Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml validate-eoln 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/classes:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml

build-prepare:
[mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/classes
[mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/bin
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/conf
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/lib
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/logs
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/webapps

compile-prepare:
 [copy] Copying 1 file to 
/srv/gump/public/workspace/tomcat-trunk/java/org/apache/catalina/startup
 [copy] Copying 1 file to 
/srv/gump/public/workspace/tomcat-trunk/webapps/docs

validate-eoln:
[javac] Compiling 1 source file to 
/srv/gump/public/workspace/tomcat-trunk/output/classes
 [checkeol] Checking line ends in 2348 file(s)
 [checkeol] Checking line ends in 85 file(s)
 [checkeol] Done line ends check in 2433 file(s), 1 error(s) found.
 [checkeol] The following files have wrong line ends: [
 [checkeol] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/el/util/Tester.java: 
uses CRLF on line 1]

BUILD FAILED
/srv/gump/public/workspace/tomcat-trunk/build.xml:549: The following files have 
wrong line ends: [
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/el/util/Tester.java: 
uses CRLF on line 1]

Total time: 27 seconds
-

To subscribe to this information via syndicated feeds:
- RSS: 
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate-eoln/rss.xml
- Atom: 
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate-eoln/atom.xml

== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 1404012013, vmgump.apache.org:vmgump:1404012013
Gump E-mail Identifier (unique within run) #16.

--
Apache Gump
http://gump.apache.org/ [Instance: vmgump]

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 54338] Class cast exception in tagPlugin Set generated code

2013-01-03 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=54338

--- Comment #3 from Sheldon Shao  ---
Yes.

The problem isn't only from primitive types.
Perform a "coerce" is a better choice.

(In reply to comment #2)
> Is it appropriate to perform a "coerce" instead of a simple cast? (I don't
> know whether the spec covers this case). If the only problem is primitive
> types, I think this can be solved without the complexity of formal coercion.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

37 matches

Mail list logo