DO NOT REPLY [Bug 50477] New: If you set 0 to initialSize, can't obtain Connection by using getConnectionAsync method.

2010-12-15 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50477

   Summary: If you set 0 to initialSize, can't obtain Connection
by using getConnectionAsync method.
   Product: Tomcat Modules
   Version: unspecified
  Platform: All
OS/Version: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: jdbc-pool
AssignedTo: dev@tomcat.apache.org
ReportedBy: mashm...@gmail.com


Created an attachment (id=26408)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=26408)
patch for ConnectionPool.java

The getConnectionAsync method returns a ItemFuture, and the ItemFuture.get
method retrieves Connection from the idle queue (= FairBlockingQueue).
If initialSize is 0, there is no PooledConnection in the idle queue. (And,
there is no way to insert PooledConnection to the idle queue except to use the
getConnection method.)
Therefore, the ItemFuture.get method doesn't return Connection.

I made the patch. It is the following. 
If the pool size is empty then create a PooledConnection and insert it to the
idle queue.

regards.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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: r1049484 - /tomcat/trunk/java/org/apache/catalina/util/ContextName.java

2010-12-15 Thread markt
Author: markt
Date: Wed Dec 15 10:46:23 2010
New Revision: 1049484

URL: http://svn.apache.org/viewvc?rev=1049484&view=rev
Log:
Fix my stupid mistake.

Modified:
tomcat/trunk/java/org/apache/catalina/util/ContextName.java

Modified: tomcat/trunk/java/org/apache/catalina/util/ContextName.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/ContextName.java?rev=1049484&r1=1049483&r2=1049484&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/ContextName.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/ContextName.java Wed Dec 15 
10:46:23 2010
@@ -150,13 +150,13 @@ public final class ContextName {
 
 public String getDisplayName() {
 StringBuilder tmp = new StringBuilder();
-if (path == "") {
+if ("".equals(path)) {
 tmp.append('/');
 } else {
 tmp.append(path);
 }
 
-if (version != "") {
+if (!"".equals(version)) {
 tmp.append(VERSION_MARKER);
 tmp.append(version);
 }



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



svn commit: r1049544 - /tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java

2010-12-15 Thread markt
Author: markt
Date: Wed Dec 15 13:31:28 2010
New Revision: 1049544

URL: http://svn.apache.org/viewvc?rev=1049544&view=rev
Log:
Remove unnecessary override

Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java

Modified: 
tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java?rev=1049544&r1=1049543&r2=1049544&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java 
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java 
Wed Dec 15 13:31:28 2010
@@ -17,7 +17,6 @@
 package examples;
 
 import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
 import javax.servlet.jsp.tagext.BodyContent;
 import javax.servlet.jsp.tagext.BodyTagSupport;
 import javax.servlet.jsp.tagext.Tag;
@@ -37,11 +36,6 @@ public abstract class ExampleTagBase ext
 }
 
 @Override
-public void setPageContext(PageContext pageContext) {
-this.pageContext = pageContext;
-}
-
-@Override
 public Tag getParent() {
 return this.parent;
 }
@@ -76,6 +70,5 @@ public abstract class ExampleTagBase ext
 }
 
 protected BodyContent bodyOut;
-protected PageContext pageContext;
 protected Tag parent;
 }



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



svn commit: r1049553 - /tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java

2010-12-15 Thread markt
Author: markt
Date: Wed Dec 15 13:53:22 2010
New Revision: 1049553

URL: http://svn.apache.org/viewvc?rev=1049553&view=rev
Log:
Fix another FindBugs niggle

Modified:

tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java

Modified: 
tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java?rev=1049553&r1=1049552&r2=1049553&view=diff
==
--- 
tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java
 (original)
+++ 
tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java
 Wed Dec 15 13:53:22 2010
@@ -19,6 +19,7 @@
 package jsp2.examples.simpletag;
 
 import java.io.IOException;
+import java.util.Random;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.JspFragment;
@@ -29,13 +30,16 @@ import javax.servlet.jsp.tagext.SimpleTa
  * JspFragment and invokes then in a random order.
  */
 public class ShuffleSimpleTag extends SimpleTagSupport {
+// No need for this to use SecureRandom
+private static Random random = new Random();
+
 private JspFragment fragment1;
 private JspFragment fragment2;
 private JspFragment fragment3;
 
 @Override
 public void doTag() throws JspException, IOException {
-switch( (int)(Math.random() * 6) ) {
+switch(random.nextInt(6)) {
 case 0:
 fragment1.invoke( null );
 fragment2.invoke( null );



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



DO NOT REPLY [Bug 50478] New: How to set tomcat clusture with session replication

2010-12-15 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50478

   Summary: How to set tomcat clusture with session replication
   Product: Tomcat 6
   Version: 6.0.26
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: major
  Priority: P2
 Component: Cluster
AssignedTo: dev@tomcat.apache.org
ReportedBy: psreejithp...@gmail.com


Hello,

Can any one guide me on how to set two tomcats in cluster mode with session
replication ?

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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: svn commit: r1049553 - /tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java

2010-12-15 Thread sebb
On 15 December 2010 13:53,   wrote:
> Author: markt
> Date: Wed Dec 15 13:53:22 2010
> New Revision: 1049553
>
> URL: http://svn.apache.org/viewvc?rev=1049553&view=rev
> Log:
> Fix another FindBugs niggle
>
> Modified:
>    
> tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java
>
> Modified: 
> tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java?rev=1049553&r1=1049552&r2=1049553&view=diff
> ==
> --- 
> tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java
>  (original)
> +++ 
> tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java
>  Wed Dec 15 13:53:22 2010
> @@ -19,6 +19,7 @@
>  package jsp2.examples.simpletag;
>
>  import java.io.IOException;
> +import java.util.Random;
>
>  import javax.servlet.jsp.JspException;
>  import javax.servlet.jsp.tagext.JspFragment;
> @@ -29,13 +30,16 @@ import javax.servlet.jsp.tagext.SimpleTa
>  * JspFragment and invokes then in a random order.
>  */
>  public class ShuffleSimpleTag extends SimpleTagSupport {
> +    // No need for this to use SecureRandom

But the field should surely be final?

> +    private static Random random = new Random();
> +
>     private JspFragment fragment1;
>     private JspFragment fragment2;
>     private JspFragment fragment3;
>
>     @Override
>     public void doTag() throws JspException, IOException {
> -        switch( (int)(Math.random() * 6) ) {
> +        switch(random.nextInt(6)) {
>             case 0:
>                 fragment1.invoke( null );
>                 fragment2.invoke( null );
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

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



DO NOT REPLY [Bug 50478] How to set tomcat clusture with session replication

2010-12-15 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50478

Chuck Caldarale  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID

--- Comment #1 from Chuck Caldarale  2010-12-15 
09:17:42 EST ---
Bugzilla is not a support forum.  Post your questions on the users mailing
list.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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



DO NOT REPLY [Bug 50453] Multiple X-Forwarded-For headers not handled by RemoteIP valve

2010-12-15 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50453

John Wastle  changed:

   What|Removed |Added

 CC||johnwas...@yahoo.co.uk

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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: r1049563 - /tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java

2010-12-15 Thread markt
Author: markt
Date: Wed Dec 15 14:34:32 2010
New Revision: 1049563

URL: http://svn.apache.org/viewvc?rev=1049563&view=rev
Log:
Fix various warnings (FindBugs, Eclipse etc.)

Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1049563&r1=1049562&r2=1049563&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Wed Dec 15 
14:34:32 2010
@@ -577,10 +577,11 @@ public class HostConfig
 if (!docBase.getCanonicalPath().startsWith(
 appBase().getAbsolutePath() + File.separator)) {
 isExternal = true;
-deployedApp.redeployResources.put
-(contextXml.getAbsolutePath(), new 
Long(contextXml.lastModified()));
+deployedApp.redeployResources.put(
+contextXml.getAbsolutePath(),
+Long.valueOf(contextXml.lastModified()));
 
deployedApp.redeployResources.put(docBase.getAbsolutePath(),
-new Long(docBase.lastModified()));
+Long.valueOf(docBase.lastModified()));
 if 
(docBase.getAbsolutePath().toLowerCase(Locale.ENGLISH).endsWith(".war")) {
 isExternalWar = true;
 }
@@ -608,9 +609,9 @@ public class HostConfig
 // watched inside it
 if (isExternalWar && unpackWARs) {
 
deployedApp.redeployResources.put(expandedDocBase.getAbsolutePath(),
-new Long(expandedDocBase.lastModified()));
-deployedApp.redeployResources.put
-(contextXml.getAbsolutePath(), new 
Long(contextXml.lastModified()));
+Long.valueOf(expandedDocBase.lastModified()));
+deployedApp.redeployResources.put(contextXml.getAbsolutePath(),
+Long.valueOf(contextXml.lastModified()));
 addWatchedResources(deployedApp, 
expandedDocBase.getAbsolutePath(), context);
 } else {
 // Find an existing matching war and expanded folder
@@ -618,12 +619,12 @@ public class HostConfig
 File warDocBase = new 
File(expandedDocBase.getAbsolutePath() + ".war");
 if (warDocBase.exists()) {
 
deployedApp.redeployResources.put(warDocBase.getAbsolutePath(),
-new Long(warDocBase.lastModified()));
+Long.valueOf(warDocBase.lastModified()));
 }
 }
 if (expandedDocBase.exists()) {
 
deployedApp.redeployResources.put(expandedDocBase.getAbsolutePath(),
-new Long(expandedDocBase.lastModified()));
+Long.valueOf(expandedDocBase.lastModified()));
 addWatchedResources(deployedApp, 
 expandedDocBase.getAbsolutePath(), context);
 } else {
@@ -631,8 +632,9 @@ public class HostConfig
 }
 // Add the context XML to the list of files which should 
trigger a redeployment
 if (!isExternal) {
-deployedApp.redeployResources.put
-(contextXml.getAbsolutePath(), new 
Long(contextXml.lastModified()));
+deployedApp.redeployResources.put(
+contextXml.getAbsolutePath(),
+Long.valueOf(contextXml.lastModified()));
 }
 }
 } catch (Throwable t) {
@@ -768,8 +770,9 @@ public class HostConfig
 istream.close();
 istream = null;
 }
-} catch (Exception e) {
-// Ignore and continue
+} catch (IOException e) {
+/* Ignore */
+} finally {
 if (ostream != null) {
 try {
 ostream.close();
@@ -786,7 +789,6 @@ public class HostConfig
 }
 istream = null;
 }
-} finally {
 entry = null;
 if (jar != null) {
 try {
@@ -839,44 +841,38 @@ public class HostConfig
 context.setConfigFile(new URL("jar:" +
 war.toURI().toString() + "!/" +
 Constants.ApplicationContextXml));
-} catch (Exception e) {
+} finally {
 if

svn commit: r1049564 - in /tomcat/trunk/res/findbugs: ./ filter-false-positives.xml

2010-12-15 Thread markt
Author: markt
Date: Wed Dec 15 14:35:22 2010
New Revision: 1049564

URL: http://svn.apache.org/viewvc?rev=1049564&view=rev
Log:
Add a FindBugs filter config for known false positives

Added:
tomcat/trunk/res/findbugs/
tomcat/trunk/res/findbugs/filter-false-positives.xml   (with props)

Added: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1049564&view=auto
==
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (added)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Wed Dec 15 14:35:22 
2010
@@ -0,0 +1,7 @@
+
+  
+
+
+
+  
+
\ No newline at end of file

Propchange: tomcat/trunk/res/findbugs/filter-false-positives.xml
--
svn:eol-style = native



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



DO NOT REPLY [Bug 50480] New: How to set tomcat clusture with session replication

2010-12-15 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50480

   Summary: How to set tomcat clusture with session replication
   Product: Tomcat 6
   Version: 6.0.26
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: major
  Priority: P2
 Component: Cluster
AssignedTo: dev@tomcat.apache.org
ReportedBy: psreejithp...@gmail.com


Hello,

Can any one guide me on how to set two tomcats in cluster mode with session
replication ?

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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



DO NOT REPLY [Bug 50480] How to set tomcat clusture with session replication

2010-12-15 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50480

Chuck Caldarale  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID

--- Comment #1 from Chuck Caldarale  2010-12-15 
09:49:23 EST ---
Again, bugzilla is not a support forum.  Post your questions on the Tomcat
users mailing list.  Continued abuse of bugzilla may well result in your
account being disabled.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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



DO NOT REPLY [Bug 50480] How to set tomcat clusture with session replication

2010-12-15 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50480

sreejith  changed:

   What|Removed |Added

 Status|RESOLVED|CLOSED

--- Comment #2 from sreejith  2010-12-15 09:55:20 EST 
---
sorry i didnt knew that

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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: r1049572 - in /tomcat/trunk: java/org/apache/el/parser/AstNegative.java java/org/apache/el/parser/SimpleNode.java res/findbugs/filter-false-positives.xml

2010-12-15 Thread markt
Author: markt
Date: Wed Dec 15 14:54:23 2010
New Revision: 1049572

URL: http://svn.apache.org/viewvc?rev=1049572&view=rev
Log:
Whilst I am thinking about excluding stuff from FindBugs - add some exceptions 
for the generated code with issues and fix the remaining issues in the same 
package

Modified:
tomcat/trunk/java/org/apache/el/parser/AstNegative.java
tomcat/trunk/java/org/apache/el/parser/SimpleNode.java
tomcat/trunk/res/findbugs/filter-false-positives.xml

Modified: tomcat/trunk/java/org/apache/el/parser/AstNegative.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstNegative.java?rev=1049572&r1=1049571&r2=1049572&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstNegative.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstNegative.java Wed Dec 15 14:54:23 
2010
@@ -47,7 +47,7 @@ public final class AstNegative extends S
 Object obj = this.children[0].getValue(ctx);
 
 if (obj == null) {
-return new Long(0);
+return Long.valueOf(0);
 }
 if (obj instanceof BigDecimal) {
 return ((BigDecimal) obj).negate();
@@ -59,27 +59,27 @@ public final class AstNegative extends S
 if (isStringFloat((String) obj)) {
 return new Double(-Double.parseDouble((String) obj));
 }
-return new Long(-Long.parseLong((String) obj));
+return Long.valueOf(-Long.parseLong((String) obj));
 }
 if (obj instanceof Long) {
-return new Long(-((Long) obj).longValue());
+return Long.valueOf(-((Long) obj).longValue());
 }
 if (obj instanceof Double) {
 return new Double(-((Double) obj).doubleValue());
 }
 if (obj instanceof Integer) {
-return new Integer(-((Integer) obj).intValue());
+return Integer.valueOf(-((Integer) obj).intValue());
 }
 if (obj instanceof Float) {
 return new Float(-((Float) obj).floatValue());
 }
 if (obj instanceof Short) {
-return new Short((short) -((Short) obj).shortValue());
+return Short.valueOf((short) -((Short) obj).shortValue());
 }
 if (obj instanceof Byte) {
-return new Byte((byte) -((Byte) obj).byteValue());
+return Byte.valueOf((byte) -((Byte) obj).byteValue());
 }
 Long num = (Long) coerceToNumber(obj, Long.class);
-return new Long(-num.longValue());
+return Long.valueOf(-num.longValue());
 }
 }

Modified: tomcat/trunk/java/org/apache/el/parser/SimpleNode.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/SimpleNode.java?rev=1049572&r1=1049571&r2=1049572&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/SimpleNode.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/SimpleNode.java Wed Dec 15 14:54:23 
2010
@@ -47,22 +47,27 @@ public abstract class SimpleNode extends
 id = i;
 }
 
+@Override
 public void jjtOpen() {
 // NOOP by default
 }
 
+@Override
 public void jjtClose() {
 // NOOP by default
 }
 
+@Override
 public void jjtSetParent(Node n) {
 parent = n;
 }
 
+@Override
 public Node jjtGetParent() {
 return parent;
 }
 
+@Override
 public void jjtAddChild(Node n, int i) {
 if (children == null) {
 children = new Node[i + 1];
@@ -74,10 +79,12 @@ public abstract class SimpleNode extends
 children[i] = n;
 }
 
+@Override
 public Node jjtGetChild(int i) {
 return children[i];
 }
 
+@Override
 public int jjtGetNumChildren() {
 return (children == null) ? 0 : children.length;
 }
@@ -102,23 +109,7 @@ public abstract class SimpleNode extends
 return prefix + toString();
 }
 
-/*
- * Override this method if you want to customize how the node dumps out its
- * children.
- */
-
-public void dump(String prefix) {
-System.out.println(toString(prefix));
-if (children != null) {
-for (int i = 0; i < children.length; ++i) {
-SimpleNode n = (SimpleNode) children[i];
-if (n != null) {
-n.dump(prefix + " ");
-}
-}
-}
-}
-
+@Override
 public String getImage() {
 return image;
 }
@@ -127,26 +118,31 @@ public abstract class SimpleNode extends
 this.image = image;
 }
 
+@Override
 public Class getType(EvaluationContext ctx)
 throws ELException {
 throw new UnsupportedOperationException();
 }
 
+@Override
 public Object getValue(EvaluationContext ctx)
 throws ELException {
 throw new Unsu

DO NOT REPLY [Bug 49000] Cookie parsing bug when an empty value has an equal sign on the end

2010-12-15 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49000

Christopher Schultz  changed:

   What|Removed |Added

   Severity|enhancement |normal

--- Comment #10 from Christopher Schultz  
2010-12-15 09:56:49 EST ---
(In reply to comment #9)
> Cookie: fred=1; jim=2; bob=; george=3

Tomcat is okay with that last one? Okay, then Tomcat is exhibiting inconsistent
behavior, and this should be considered a bug.

> Looking at logs, I can see that IE6, IE7 and IE8 all sends the bob= type
> entries. Generally this is fine, unless it's the last item in the semi-colon
> delimited list, in which case Tomcat drops the cookie entry.

Would you agree that dropping the bob= cookie altogether no matter where it is
in the list is expected, spec-compliant behavior?

> I agree with everything said - if name and value are mandatory then none of 
> the
> above should be accepted. However, the current Tomcat functionality is such
> that 3/4 of the options are accepted and anyone relying on this is going to
> have a very confusing feature where IE traffic sporadically drops a cookie.

Agreed.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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



DO NOT REPLY [Bug 9745] extern cache mgt bug for conditionally dynamic pages

2010-12-15 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=9745

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #3 from Mark Thomas  2010-12-15 10:46:41 EST ---
This has been fixed for some time in 7.0.x and 6.0.x (and I suspect 5.5.x as
well)

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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



DO NOT REPLY [Bug 10021] Include upgrade option in installer

2010-12-15 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=10021

--- Comment #5 from Christopher Schultz  
2010-12-15 11:22:30 EST ---
There's also the problem of somehow merging configurations: sometimes,
server.xml is updated even within a stable line. The safest thing to do is
simply leave server.xml alone, but we might still run across problems there.

How traumatic are changes allowed to be within a particular version line
(6.0.x)? For example, the JreMemoryLeakDetectionListener was introduced at some
point in 6.0.x but hasn't always been there. That's not a problem as /adding/
something isn't a big deal. Do we ever /remove/ anything that might cause a
startup failure?

Similarly, sometimes configuration defaults change: do we have to detect
whether the old defaults are in use and then explicitly set them to their old
default values in server.xml/web.xml/context.xml?

The process of upgrading could seriously break someone's configuration.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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



DO NOT REPLY [Bug 10021] Include upgrade option in installer

2010-12-15 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=10021

--- Comment #4 from Mark Thomas  2010-12-15 11:13:33 EST ---
Some random thoughts on this. If this is implemented, separating CATALINA_HOME
/ CATALINA_BASE is one way to go since that will simplify the upgrade process.
That then raises a number of additional questions:
- Are multiple HOMEs supported? If so how?
- Are multiple BASEs supported? If so how?
- Does uninstall remove a HOME, all HOMEs?
- If a HOME is uninstalled what happens to BASEs using it?

That could all get quite complicated.

The other approach is to just update the binaries (*.exe, *.jar) leaving the
config as is. The more I think about it, the more 'do-able' this sounds. May
need an upgrade specific read-me for any recommended config updates (changes to
defaults, new settings etc).

I'm leaving this open as I think it is worth doing (well, at least worth
looking at in more detail) but it feels like a fair amount of work to get
right.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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: r1049638 - in /tomcat/trunk: java/org/apache/catalina/authenticator/AuthenticatorBase.java webapps/docs/changelog.xml webapps/docs/config/valve.xml

2010-12-15 Thread markt
Author: markt
Date: Wed Dec 15 16:41:31 2010
New Revision: 1049638

URL: http://svn.apache.org/viewvc?rev=1049638&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=10526
Add alwaysUseSession option to authenticators

Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/valve.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1049638&r1=1049637&r2=1049638&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java 
Wed Dec 15 16:41:31 2010
@@ -116,6 +116,19 @@ public abstract class AuthenticatorBase 
 
 
 /**
+ * Should a session always be used once a user is authenticated? This may
+ * offer some performance benefits since the session can then be used to
+ * cache the authenticated Principal, hence removing the need to
+ * authenticate the user via the Realm on every request. This may be of 
help
+ * for combinations such as BASIC authentication used with the JNDIRealm or
+ * DataSourceRealms. However there will also be the performance cost of
+ * creating and GC'ing the session. By default, a session will not be
+ * created. 
+ */
+protected boolean alwaysUseSession = false;
+
+
+/**
  * Should we cache authenticated Principals if the request is part of
  * an HTTP session?
  */
@@ -681,10 +694,14 @@ public abstract class AuthenticatorBase 
 
 Session session = request.getSessionInternal(false);
 
-if (session != null && changeSessionIdOnAuthentication) {
-Manager manager = request.getContext().getManager();
-manager.changeSessionId(session);
-request.changeSessionId(session.getId());
+if (session != null) {
+if (changeSessionIdOnAuthentication) {
+Manager manager = request.getContext().getManager();
+manager.changeSessionId(session);
+request.changeSessionId(session.getId());
+}
+} else if (alwaysUseSession) {
+session = request.getSessionInternal(true);
 }
 
 // Cache the authentication information in our session, if any

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1049638&r1=1049637&r2=1049638&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Dec 15 16:41:31 2010
@@ -48,6 +48,11 @@
 8705: org.apache.catalina.SessionListener now
 extends java.util.EventListener. (markt)
   
+  
+10526: Add an option to the Authenticators to
+force the creation of a session on authentication which may offer some
+performance benefits. (markt)
+  
   
 48692: Provide option to parse
 application/x-www-form-urlencoded PUT requests. (schultz)

Modified: tomcat/trunk/webapps/docs/config/valve.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/valve.xml?rev=1049638&r1=1049637&r2=1049638&view=diff
==
--- tomcat/trunk/webapps/docs/config/valve.xml (original)
+++ tomcat/trunk/webapps/docs/config/valve.xml Wed Dec 15 16:41:31 2010
@@ -412,6 +412,17 @@
 
org.apache.catalina.authenticator.BasicAuthenticator.
   
 
+  
+Should a session always be used once a user is authenticated? This
+may offer some performance benefits since the session can then be used
+to cache the authenticated Principal, hence removing the need to
+authenticate the user via the Realm on every request. This may be of
+help for combinations such as BASIC authentication used with the
+JNDIRealm or DataSourceRealms. However there will also be the
+performance cost of creating and GC'ing the session. If not set, the
+default value of false will be used.
+  
+
   
 Controls if the session ID is changed if a session exists at the
 point where users are authenticated. This is to prevent session 
fixation



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



DO NOT REPLY [Bug 10526] Authenticators do not always cache the Principal

2010-12-15 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=10526

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #2 from Mark Thomas  2010-12-15 11:41:47 EST ---
Fixed in 7.0.x and will be in 7.0.6 onwards.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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



DO NOT REPLY [Bug 10565] shutdown hook problem: java.lang.NoClassDefFoundError: java/util/Iterator

2010-12-15 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=10565

Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||WONTFIX

--- Comment #6 from Mark Thomas  2010-12-15 11:47:36 EST ---
I don't see a way to fix this given the class loading issues.

I agree with Remy that web applications should not be registering shut down
hooks. There are lots of things the specification doesn't mention (shut down
hooks, calling System.exit(), etc) - that doesn't mean they are all a good idea
in a container environment.

A ServletContextListener is the probably the way to go.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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: r1049654 - in /tomcat/trunk: java/org/apache/catalina/startup/Catalina.java java/org/apache/tomcat/util/digester/Digester.java java/org/apache/tomcat/util/digester/ObjectCreateRule.java we

2010-12-15 Thread markt
Author: markt
Date: Wed Dec 15 17:58:05 2010
New Revision: 1049654

URL: http://svn.apache.org/viewvc?rev=1049654&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=10972
Improve error message if the className attribute is missing on an element in 
server.xml where it is required.

Modified:
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1049654&r1=1049653&r2=1049654&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Wed Dec 15 
17:58:05 2010
@@ -45,6 +45,7 @@ import org.apache.tomcat.util.log.System
 import org.apache.tomcat.util.res.StringManager;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
+import org.xml.sax.SAXParseException;
 
 
 /**
@@ -532,9 +533,12 @@ public class Catalina {
 digester.push(this);
 digester.parse(inputSource);
 inputStream.close();
+} catch (SAXParseException spe) {
+log.warn("Catalina.start using " + getConfigFile() + ": " +
+spe.getMessage());
+return;
 } catch (Exception e) {
-log.warn("Catalina.start using "
-   + getConfigFile() + ": " , e);
+log.warn("Catalina.start using " + getConfigFile() + ": " , e);
 return;
 }
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1049654&r1=1049653&r2=1049654&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Wed Dec 15 
17:58:05 2010
@@ -2682,7 +2682,7 @@ public class Digester extends DefaultHan
 }
 if (locator != null) {
 String error = "Error at (" + locator.getLineNumber() + ", " +
-locator.getColumnNumber() + ": " + message;
+locator.getColumnNumber() + ") : " + message;
 if (e != null) {
 return new SAXParseException(error, locator, e);
 } else {

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java?rev=1049654&r1=1049653&r2=1049654&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java Wed 
Dec 15 17:58:05 2010
@@ -136,11 +136,15 @@ public class ObjectCreateRule extends Ru
 "}New " + realClassName);
 }
 
+if (realClassName == null) {
+throw new NullPointerException("No class name specified for " +
+namespace + " " + name);
+}
+
 // Instantiate the new object and push it on the context stack
 Class clazz = digester.getClassLoader().loadClass(realClassName);
 Object instance = clazz.newInstance();
 digester.push(instance);
-
 }
 
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1049654&r1=1049653&r2=1049654&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Dec 15 17:58:05 2010
@@ -54,6 +54,10 @@
 performance benefits. (markt)
   
   
+10972: Improve error message if the className attribute is
+missing on an element in server.xml where it is required. (markt)
+  
+  
 48692: Provide option to parse
 application/x-www-form-urlencoded PUT requests. (schultz)
   



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



DO NOT REPLY [Bug 10972] without className in server.xml produces NullPointerException

2010-12-15 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=10972

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #3 from Mark Thomas  2010-12-15 12:58:14 EST ---
This has been fixed in 7.0.5 and will be included in 7.0.6 onwards.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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



DO NOT REPLY [Bug 11754] Synchronous shutdown script - shutdown.sh should wait until Tomcat is fully shut down

2010-12-15 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=11754

Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED

--- Comment #5 from Mark Thomas  2010-12-15 13:00:46 EST ---
You can do this in Tomcat 7 if you specify a PID file.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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



DO NOT REPLY [Bug 12069] Creation of more HttpSession objects for one previously timed out session

2010-12-15 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=12069

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #6 from Mark Thomas  2010-12-15 13:11:30 EST ---
This was fixed for 5.5.x (and 6.0.x, 7.0.x) by re-using the session ID

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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: svn commit: r1049654 - in /tomcat/trunk: java/org/apache/catalina/startup/Catalina.java java/org/apache/tomcat/util/digester/Digester.java java/org/apache/tomcat/util/digester/ObjectCreateRule.jav

2010-12-15 Thread Christopher Schultz
Mark,

Does this patch actually change anything? It looks like you've created a
new catch block that does exactly what the existing one would have done.

-chris

On 12/15/2010 12:58 PM, ma...@apache.org wrote:
> Author: markt
> Date: Wed Dec 15 17:58:05 2010
> New Revision: 1049654
> 
> URL: http://svn.apache.org/viewvc?rev=1049654&view=rev
> Log:
> https://issues.apache.org/bugzilla/show_bug.cgi?id=10972
> Improve error message if the className attribute is missing on an element in 
> server.xml where it is required.
> 
> Modified:
> tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
> tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
> tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java
> tomcat/trunk/webapps/docs/changelog.xml
> 
> Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1049654&r1=1049653&r2=1049654&view=diff
> ==
> --- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
> +++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Wed Dec 15 
> 17:58:05 2010
> @@ -45,6 +45,7 @@ import org.apache.tomcat.util.log.System
>  import org.apache.tomcat.util.res.StringManager;
>  import org.xml.sax.Attributes;
>  import org.xml.sax.InputSource;
> +import org.xml.sax.SAXParseException;
>  
>  
>  /**
> @@ -532,9 +533,12 @@ public class Catalina {
>  digester.push(this);
>  digester.parse(inputSource);
>  inputStream.close();
> +} catch (SAXParseException spe) {
> +log.warn("Catalina.start using " + getConfigFile() + ": " +
> +spe.getMessage());
> +return;
>  } catch (Exception e) {
> -log.warn("Catalina.start using "
> -   + getConfigFile() + ": " , e);
> +log.warn("Catalina.start using " + getConfigFile() + ": " , e);
>  return;
>  }
>  
> 
> Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1049654&r1=1049653&r2=1049654&view=diff
> ==
> --- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
> +++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Wed Dec 
> 15 17:58:05 2010
> @@ -2682,7 +2682,7 @@ public class Digester extends DefaultHan
>  }
>  if (locator != null) {
>  String error = "Error at (" + locator.getLineNumber() + ", " +
> -locator.getColumnNumber() + ": " + message;
> +locator.getColumnNumber() + ") : " + message;
>  if (e != null) {
>  return new SAXParseException(error, locator, e);
>  } else {
> 
> Modified: 
> tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java?rev=1049654&r1=1049653&r2=1049654&view=diff
> ==
> --- tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java 
> (original)
> +++ tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java 
> Wed Dec 15 17:58:05 2010
> @@ -136,11 +136,15 @@ public class ObjectCreateRule extends Ru
>  "}New " + realClassName);
>  }
>  
> +if (realClassName == null) {
> +throw new NullPointerException("No class name specified for " +
> +namespace + " " + name);
> +}
> +
>  // Instantiate the new object and push it on the context stack
>  Class clazz = digester.getClassLoader().loadClass(realClassName);
>  Object instance = clazz.newInstance();
>  digester.push(instance);
> -
>  }
>  
>  
> 
> Modified: tomcat/trunk/webapps/docs/changelog.xml
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1049654&r1=1049653&r2=1049654&view=diff
> ==
> --- tomcat/trunk/webapps/docs/changelog.xml (original)
> +++ tomcat/trunk/webapps/docs/changelog.xml Wed Dec 15 17:58:05 2010
> @@ -54,6 +54,10 @@
>  performance benefits. (markt)
>
>
> +10972: Improve error message if the className attribute is
> +missing on an element in server.xml where it is required. (markt)
> +  
> +  
>  48692: Provide option to parse
>  application/x-www-form-urlencoded PUT requests. 
> (schultz)
>
> 
> 
> 
> -
> T

DO NOT REPLY [Bug 49000] Cookie parsing bug when an empty value has an equal sign on the end

2010-12-15 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49000

--- Comment #11 from Henri Yandell  2010-12-15 14:28:21 
EST ---
Yes, bob= is fine unless it's on the end of the line and then it's dropped (I
just doublechecked with some unit tests as it's been a while since I was
digging into this).

I think there are three options:

1) Spec purity. Drop 'key' and drop 'key='.
2) Closer to the spec. Drop 'key=', keep 'key'.
3) Backwards compat. Support 'key=' at end of line.

I think that, ideally, it would be a case of TC7 being #1, while Mark's
proposed ALLOW_NAME_ONLY_COOKIES feature would continue to support #3. I don't
think there's a value in dropping 'key=' and keeping 'key'.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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: svn commit: r1049654 - in /tomcat/trunk: java/org/apache/catalina/startup/Catalina.java java/org/apache/tomcat/util/digester/Digester.java java/org/apache/tomcat/util/digester/ObjectCreateRule.jav

2010-12-15 Thread Mark Thomas
On 15/12/2010 19:19, Christopher Schultz wrote:
> Mark,
> 
> Does this patch actually change anything?

Yes, it fixes the associated bug report.

> It looks like you've created a
> new catch block that does exactly what the existing one would have done.

The new code is not the same. I'll leave exactly what the difference is
as an exercise for the reader.

Mark

> 
> -chris
> 
> On 12/15/2010 12:58 PM, ma...@apache.org wrote:
>> Author: markt
>> Date: Wed Dec 15 17:58:05 2010
>> New Revision: 1049654
>>
>> URL: http://svn.apache.org/viewvc?rev=1049654&view=rev
>> Log:
>> https://issues.apache.org/bugzilla/show_bug.cgi?id=10972
>> Improve error message if the className attribute is missing on an element in 
>> server.xml where it is required.
>>
>> Modified:
>> tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
>> tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
>> tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java
>> tomcat/trunk/webapps/docs/changelog.xml
>>
>> Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
>> URL: 
>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1049654&r1=1049653&r2=1049654&view=diff
>> ==
>> --- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
>> +++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Wed Dec 15 
>> 17:58:05 2010
>> @@ -45,6 +45,7 @@ import org.apache.tomcat.util.log.System
>>  import org.apache.tomcat.util.res.StringManager;
>>  import org.xml.sax.Attributes;
>>  import org.xml.sax.InputSource;
>> +import org.xml.sax.SAXParseException;
>>  
>>  
>>  /**
>> @@ -532,9 +533,12 @@ public class Catalina {
>>  digester.push(this);
>>  digester.parse(inputSource);
>>  inputStream.close();
>> +} catch (SAXParseException spe) {
>> +log.warn("Catalina.start using " + getConfigFile() + ": " +
>> +spe.getMessage());
>> +return;
>>  } catch (Exception e) {
>> -log.warn("Catalina.start using "
>> -   + getConfigFile() + ": " , e);
>> +log.warn("Catalina.start using " + getConfigFile() + ": " , e);
>>  return;
>>  }
>>  
>>
>> Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
>> URL: 
>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1049654&r1=1049653&r2=1049654&view=diff
>> ==
>> --- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java 
>> (original)
>> +++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Wed Dec 
>> 15 17:58:05 2010
>> @@ -2682,7 +2682,7 @@ public class Digester extends DefaultHan
>>  }
>>  if (locator != null) {
>>  String error = "Error at (" + locator.getLineNumber() + ", " +
>> -locator.getColumnNumber() + ": " + message;
>> +locator.getColumnNumber() + ") : " + message;
>>  if (e != null) {
>>  return new SAXParseException(error, locator, e);
>>  } else {
>>
>> Modified: 
>> tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java
>> URL: 
>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java?rev=1049654&r1=1049653&r2=1049654&view=diff
>> ==
>> --- tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java 
>> (original)
>> +++ tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java 
>> Wed Dec 15 17:58:05 2010
>> @@ -136,11 +136,15 @@ public class ObjectCreateRule extends Ru
>>  "}New " + realClassName);
>>  }
>>  
>> +if (realClassName == null) {
>> +throw new NullPointerException("No class name specified for " +
>> +namespace + " " + name);
>> +}
>> +
>>  // Instantiate the new object and push it on the context stack
>>  Class clazz = digester.getClassLoader().loadClass(realClassName);
>>  Object instance = clazz.newInstance();
>>  digester.push(instance);
>> -
>>  }
>>  
>>  
>>
>> Modified: tomcat/trunk/webapps/docs/changelog.xml
>> URL: 
>> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1049654&r1=1049653&r2=1049654&view=diff
>> ==
>> --- tomcat/trunk/webapps/docs/changelog.xml (original)
>> +++ tomcat/trunk/webapps/docs/changelog.xml Wed Dec 15 17:58:05 2010
>> @@ -54,6 +54,10 @@
>>  performance benefits. (markt)
>>
>>
>> +10972: Improve error message if the classNam