svn commit: r607397 - /tomcat/current/tc5.5.x/STATUS.txt

2007-12-29 Thread pero
Author: pero
Date: Sat Dec 29 00:30:00 2007
New Revision: 607397

URL: http://svn.apache.org/viewvc?rev=607397&view=rev
Log:
Cast my vote

Modified:
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=607397&r1=607396&r2=607397&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sat Dec 29 00:30:00 2007
@@ -60,7 +60,7 @@
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43675 Possible logging
   releated class loader leak
   http://svn.apache.org/viewvc?rev=594700&view=rev
-  +1: markt
+  +1: markt, pero
   -1:
 
 * Update TC5 with the new Cookie handling code from TC6
@@ -121,7 +121,7 @@
   Provide an error message when trying to upload a war if the context is 
defined
   in server.xml
   http://svn.apache.org/viewvc?rev=600177&view=rev
-  +1: markt
+  +1: markt, pero
   -1:
 
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43594
@@ -132,7 +132,7 @@
 
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44041
   http://svn.apache.org/viewvc?rev=603340&view=rev
-  +1: markt
+  +1: markt, pero
   -1:
 
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44094



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 44096] - Find invalid session object.

2007-12-29 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=44096


[EMAIL PROTECTED] changed:

   What|Removed |Added

 CC|[EMAIL PROTECTED]|
 Status|REOPENED|RESOLVED
 Resolution||INVALID




--- Additional Comments From [EMAIL PROTECTED]  2007-12-29 03:05 ---
Your test case is broken - this bug is invalid. Please do not re-open this bug. 
If you have any further questions as to why your test case isn't behaving as you
expect please use the users list.

I have already read issue 43839, investigated issue 43839, confirmed the bug
described in issue 43839, fixed the bug described in issue 43839 and committed a
fix for 6.0.x for the bug described in issue 43839. Your comments strongly
suggest you haven't looked at 43839 in the last few days.

You should never, ever add someone else's e-mail address to the cc list without
their permission. It is a form a spam and considered (by me at least) to be
extremely rude. In this case it is also totally unnecessary. I am subscribed to
the dev list where every change to every issue is reported.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r607464 - in /tomcat/trunk/java/org/apache/jasper: JspCompilationContext.java compiler/JspRuntimeContext.java

2007-12-29 Thread markt
Author: markt
Date: Sat Dec 29 11:28:41 2007
New Revision: 607464

URL: http://svn.apache.org/viewvc?rev=607464&view=rev
Log:
Fix bug 43878. When development mode isn't being used, use a single 
JasperLoader. The main benefit is a reduction in the use of perm gen space when 
there are many JSPs all using the same few tags since the tags are loaded once 
rather than once per JSP.

Modified:
tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java

Modified: tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=607464&r1=607463&r2=607464&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java Sat Dec 29 
11:28:41 2007
@@ -34,7 +34,6 @@
 import org.apache.jasper.compiler.JspUtil;
 import org.apache.jasper.compiler.Localizer;
 import org.apache.jasper.compiler.ServletWriter;
-import org.apache.jasper.servlet.JasperLoader;
 import org.apache.jasper.servlet.JspServletWrapper;
 
 /**
@@ -176,11 +175,7 @@
 
 public ClassLoader getJspLoader() {
 if( jspLoader == null ) {
-jspLoader = new JasperLoader
-(new URL[] {baseUrl},
-getClassLoader(),
-rctxt.getPermissionCollection(),
-rctxt.getCodeSource());
+jspLoader = rctxt.getJspLoader(baseUrl, getClassLoader());
 }
 return jspLoader;
 }

Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java?rev=607464&r1=607463&r2=607464&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java Sat Dec 
29 11:28:41 2007
@@ -38,6 +38,7 @@
 import org.apache.jasper.Options;
 import org.apache.jasper.runtime.JspFactoryImpl;
 import org.apache.jasper.security.SecurityClassLoad;
+import org.apache.jasper.servlet.JasperLoader;
 import org.apache.jasper.servlet.JspServletWrapper;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -155,6 +156,7 @@
 private ServletContext context;
 private Options options;
 private URLClassLoader parentClassLoader;
+private JasperLoader jspLoader;
 private PermissionCollection permissionCollection;
 private CodeSource codeSource;
 private String classpath;
@@ -314,6 +316,29 @@
  */
 public String getClassPath() {
 return classpath;
+}
+
+
+/**
+ * Obtain the classloader to use when loading JSP resources. In development
+ * mode, each JSP has a separate classloader to enable easy re-loading of
+ * modified JSPs. If not in development mode, a single loader is used to
+ * reduce perm gen usage when many JSPs all use the same handful of tags.
+ */
+public URLClassLoader getJspLoader(URL baseUrl, ClassLoader parent) {
+if (jspLoader == null) {
+if (options.getDevelopment()) {
+jspLoader = new JasperLoader
+(new URL[] {baseUrl},
+parent,
+permissionCollection,
+codeSource);
+} else {
+jspLoader = new JasperLoader(new URL[] {baseUrl},
+parent, permissionCollection, codeSource);
+}
+}
+return jspLoader;
 }
 
 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 43878] - Tag-file classes get loaded for each JSP -> perm gen space problem

2007-12-29 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43878





--- Additional Comments From [EMAIL PROTECTED]  2007-12-29 11:31 ---
I have committed the following fix for this to trunk.
http://svn.apache.org/viewvc?rev=607464&view=rev

Feedback from any testing you could do would be much appreciated.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r607483 - /tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java

2007-12-29 Thread markt
Author: markt
Date: Sat Dec 29 14:45:21 2007
New Revision: 607483

URL: http://svn.apache.org/viewvc?rev=607483&view=rev
Log:
Fix bug 43868. MBean methods getInvoke and getSetter were broken.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java?rev=607483&r1=607482&r2=607483&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java Sat Dec 
29 14:45:21 2007
@@ -542,7 +542,7 @@
 Object object = null;
 NoSuchMethodException exception = null;
 try {
-object = this;
+object = bean;
 m = object.getClass().getMethod(setMethod, signature);
 } catch (NoSuchMethodException e) {
 exception = e;;
@@ -601,7 +601,7 @@
 Object object = null;
 Exception exception = null;
 try {
-object = this;
+object = bean;
 method = object.getClass().getMethod(aname, types);
 } catch (NoSuchMethodException e) {
 exception = e;



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r607485 - /tomcat/tc6.0.x/trunk/STATUS.txt

2007-12-29 Thread markt
Author: markt
Date: Sat Dec 29 14:55:05 2007
New Revision: 607485

URL: http://svn.apache.org/viewvc?rev=607485&view=rev
Log:
Propose fix for 43868

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=607485&r1=607484&r2=607485&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Dec 29 14:55:05 2007
@@ -53,3 +53,9 @@
   http://svn.apache.org/viewvc?rev=606996&view=rev
   +1: funkman, markt, pero, yoavs
   -1: 
+
+* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43868
+  MBean methods getInvoke() and getSetter() were broken
+  http://svn.apache.org/viewvc?rev=607483&view=rev
+  +1: markt
+  -1:



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 43868] - MBeanServer invoke issue

2007-12-29 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43868





--- Additional Comments From [EMAIL PROTECTED]  2007-12-29 14:55 ---
This has been fixed in svn and proposed for inclusion in 6.0.x

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]