Re: tcnative API stability/compatibility
On 02.01.2009 08:25, Mladen Turk wrote: Rainer Jung wrote: a) bundling native and org/apache/tomcat/jni code in one place in svn and releasing together or b) separating only the native implementation Option a) was used cause we didn't have separate tcnative release when it was introduced. Since this is now a separate downloadable bundle we should use the option b) and populate Java classes during download task when building Tomcat. I'm not sure I exactly understand this: when using b), the Java classes will be kept where? If we don't change anything, they (copies of them) are already part of TC trunk and TC 6, so need to "populate". Do we want to delete the copies of org/apache/tomcat/jni in TC trunk and 6.0.x and use instead ones downloaded from a tcnative release or an svn external to the new tcnative svn location? I tend to suggest a) and also getting rid of the redundant copies of the classes in TC trunk and 6, but I'm not sure if I noticed all implications. We cannot use that option because of separate release cycles. I was trying to keep them together, but other folks didn't agree with that, so now we'll have to choose the option b), which is fine as well. It needs some build process changes, but that shouldn't be a problem. I'm not sure, if the separate release cycles prevent a). My impression is, that the Java API of tcnative (org.apache.tomcat.jni) is pretty stable, so the need for releasing versions of that when releasing a version of Tomcat should not be the regular case. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46462] JSPWiki JSP compilation prevented by org.apache.jasper.Constants.JSP_PACKAGE_NAME
https://issues.apache.org/bugzilla/show_bug.cgi?id=46462 jalkanen changed: What|Removed |Added CC||jalka...@apache.org -- 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: tcnative API stability/compatibility
Rainer Jung wrote: On 02.01.2009 08:25, Mladen Turk wrote: Rainer Jung wrote: a) bundling native and org/apache/tomcat/jni code in one place in svn and releasing together or b) separating only the native implementation Option a) was used cause we didn't have separate tcnative release when it was introduced. Since this is now a separate downloadable bundle we should use the option b) and populate Java classes during download task when building Tomcat. I'm not sure I exactly understand this: when using b), the Java classes will be kept where? If we don't change anything, they (copies of them) are already part of TC trunk and TC 6, so need to "populate". Like now, in connectors/jni/java I'm not sure, if the separate release cycles prevent a). My impression is, that the Java API of tcnative (org.apache.tomcat.jni) is pretty stable, so the need for releasing versions of that when releasing a version of Tomcat should not be the regular case. It doesn't mater if the API is stable or not. Tomcat will just depend on tomcat-native-1.xx.noarch.bin.zip and use the pre-compiled .jar (like any other jakarta-commons component for example) Regards -- ^(TM) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r730694 - /tomcat/trunk/java/org/apache/jasper/servlet/JasperLoader.java
Author: markt
Date: Fri Jan 2 03:05:45 2009
New Revision: 730694
URL: http://svn.apache.org/viewvc?rev=730694&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46462
Limit the package test to org.apache.jsp.* rather than org.apache.jsp* to allow
use of packages like org.apache.jspwiki
Modified:
tomcat/trunk/java/org/apache/jasper/servlet/JasperLoader.java
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JasperLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JasperLoader.java?rev=730694&r1=730693&r2=730694&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/servlet/JasperLoader.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JasperLoader.java Fri Jan 2
03:05:45 2009
@@ -122,7 +122,7 @@
}
}
-if( !name.startsWith(Constants.JSP_PACKAGE_NAME) ) {
+if( !name.startsWith(Constants.JSP_PACKAGE_NAME + '.') ) {
// Class is not in org.apache.jsp, therefore, have our
// parent load it
clazz = parent.loadClass(name);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r730696 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Fri Jan 2 03:10:03 2009 New Revision: 730696 URL: http://svn.apache.org/viewvc?rev=730696&view=rev Log: Propose fix for 46462 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=730696&r1=730695&r2=730696&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 2 03:10:03 2009 @@ -255,3 +255,10 @@ http://svn.apache.org/viewvc?rev=730590&view=rev +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46462 + Limit package test to just the o.a.jsp package to allow use of packages such + as o.a.jspwiki + http://svn.apache.org/viewvc?rev=730694&view=rev + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46462] JSPWiki JSP compilation prevented by org.apache.jasper.Constants.JSP_PACKAGE_NAME
https://issues.apache.org/bugzilla/show_bug.cgi?id=46462 --- Comment #1 from Mark Thomas 2009-01-02 03:10:31 PST --- This has been fixed in trunk and proposed for 6.0.x. providing it gets two more +1 votes it will be included in 6.0.19 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
Re: tcnative API stability/compatibility
On 02.01.2009 11:57, Mladen Turk wrote: Rainer Jung wrote: On 02.01.2009 08:25, Mladen Turk wrote: Rainer Jung wrote: a) bundling native and org/apache/tomcat/jni code in one place in svn and releasing together or b) separating only the native implementation Option a) was used cause we didn't have separate tcnative release when it was introduced. Since this is now a separate downloadable bundle we should use the option b) and populate Java classes during download task when building Tomcat. I'm not sure I exactly understand this: when using b), the Java classes will be kept where? If we don't change anything, they (copies of them) are already part of TC trunk and TC 6, so need to "populate". Like now, in connectors/jni/java Tomcat 6 and trunk do *not* use connectors/jni/java. They use private copies of these files, which are not svn externals. Only TC 5.5 uses the above path via svn externals. Those copies are in tomcat/trunk/java/org/apache/tomcat/jni/ and tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/ I'm not sure, if the separate release cycles prevent a). My impression is, that the Java API of tcnative (org.apache.tomcat.jni) is pretty stable, so the need for releasing versions of that when releasing a version of Tomcat should not be the regular case. It doesn't mater if the API is stable or not. Tomcat will just depend on tomcat-native-1.xx.noarch.bin.zip and use the pre-compiled .jar (like any other jakarta-commons component for example) OK, I think that's exactly what I meant with a) and with removing the Java class copies from the Tomcat source tree. The jar file with the o.a.tomcat.jni classes would be part of the tomcat-native binary release (which it is not now) and the Tomcat build procedure would download the tomcat-native binary release and unpack like it does for commons. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: tcnative API stability/compatibility
Rainer Jung wrote: On 02.01.2009 11:57, Mladen Turk wrote: It doesn't mater if the API is stable or not. Tomcat will just depend on tomcat-native-1.xx.noarch.bin.zip and use the pre-compiled .jar (like any other jakarta-commons component for example) OK, I think that's exactly what I meant with a) and with removing the Java class copies from the Tomcat source tree. The jar file with the o.a.tomcat.jni classes would be part of the tomcat-native binary release (which it is not now) and the Tomcat build procedure would download the tomcat-native binary release and unpack like it does for commons. Exactly. Regards -- ^(TM) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46462] JSPWiki JSP compilation prevented by org.apache.jasper.Constants.JSP_PACKAGE_NAME
https://issues.apache.org/bugzilla/show_bug.cgi?id=46462 metskem changed: What|Removed |Added URL|https://issues.apache.org/ji|https://issues.apache.org/ji |ra/browse/JSPWIKI-464 |ra/browse/JSPWIKI-465 --- Comment #2 from metskem 2009-01-02 03:52:38 PST --- I created a new separate JIRA issue for JSPWiki: https://issues.apache.org/jira/browse/JSPWIKI-465 -- 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 37498] [PATCH] NPE in org.apache.catalina.core.ContainerBase.removeChild
https://issues.apache.org/bugzilla/show_bug.cgi?id=37498 Mark Thomas changed: What|Removed |Added Attachment #17908|0 |1 is obsolete|| --- Comment #17 from Mark Thomas 2009-01-02 06:04:37 PST --- Created an attachment (id=23069) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=23069) Proposed patch I have been reviewing this issue and it appears that the original bug report is actually multiple inter-related issues. Using a later version where a number of these have been fixed makes this a lot easier to get one's head around. The original test case is still valid but the log4j jar should be replaced with the latest version as the version included appears to suffer from jar locking when used on later Tomcat versions. The remaining issue is that the undeploy is triggered by deleting the exploded directory. When the logging mechanism tries to load the additional classes it requires it can't since the JAR has been deleted. The exception this causes means that the context is not correctly cleaned up. This also causes issues for subsequent re-deployments. Undeployment via the manager does not experience this issue since in this scenario the jars are not deleted until later in the process. A temporary work-around may be to use the context listener to ensure the class(es) required by the logger during shutdown is loaded (I haven't tested this). I do not believe the proposed two line patch is correct since it would redirect logging to Tomcat in cases where this is not necessary. I have attached an alternative patch which I will propose for inclusion in 5.5.x. -- 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: r730722 - /tomcat/current/tc5.5.x/STATUS.txt
Author: markt Date: Fri Jan 2 06:07:07 2009 New Revision: 730722 URL: http://svn.apache.org/viewvc?rev=730722&view=rev Log: Propose fix for 37498 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=730722&r1=730721&r2=730722&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Fri Jan 2 06:07:07 2009 @@ -155,3 +155,10 @@ http://people.apache.org/~markt/patches/2009-01-01-bug36923.patch +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37498 + Handle logging errors during undeployment triggered by deleting the base + diretcory + https://issues.apache.org/bugzilla/attachment.cgi?id=23069 + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r730735 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Author: markt
Date: Fri Jan 2 06:24:35 2009
New Revision: 730735
URL: http://svn.apache.org/viewvc?rev=730735&view=rev
Log:
Fix https://issues.apache.org/bugzilla/attachment.cgi?id=23066
Sync issue leads to NPE in rare circumstances
Patch provided by Konstantin Kolinko
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=730735&r1=730734&r2=730735&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Fri Jan
2 06:24:35 2009
@@ -1794,7 +1794,11 @@
return clazz;
synchronized (this) {
-if (entry.binaryContent == null && entry.loadedClass == null)
+clazz = entry.loadedClass;
+if (clazz != null)
+return clazz;
+
+if (entry.binaryContent == null)
throw new ClassNotFoundException(name);
// Looking up the package
@@ -1843,26 +1847,22 @@
}
-if (entry.loadedClass == null) {
-try {
-clazz = defineClass(name, entry.binaryContent, 0,
-entry.binaryContent.length,
-new CodeSource(entry.codeBase,
entry.certificates));
-} catch (UnsupportedClassVersionError ucve) {
-throw new UnsupportedClassVersionError(
-ucve.getLocalizedMessage() + " " +
-sm.getString("webappClassLoader.wrongVersion",
-name));
-}
-entry.loadedClass = clazz;
-entry.binaryContent = null;
-entry.source = null;
-entry.codeBase = null;
-entry.manifest = null;
-entry.certificates = null;
-} else {
-clazz = entry.loadedClass;
-}
+try {
+clazz = defineClass(name, entry.binaryContent, 0,
+entry.binaryContent.length,
+new CodeSource(entry.codeBase, entry.certificates));
+} catch (UnsupportedClassVersionError ucve) {
+throw new UnsupportedClassVersionError(
+ucve.getLocalizedMessage() + " " +
+sm.getString("webappClassLoader.wrongVersion",
+name));
+}
+entry.loadedClass = clazz;
+entry.binaryContent = null;
+entry.source = null;
+entry.codeBase = null;
+entry.manifest = null;
+entry.certificates = null;
}
return clazz;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r730742 - in /tomcat: current/tc5.5.x/STATUS.txt tc6.0.x/trunk/STATUS.txt
Author: markt Date: Fri Jan 2 06:31:54 2009 New Revision: 730742 URL: http://svn.apache.org/viewvc?rev=730742&view=rev Log: Propose fix for 37458 Modified: tomcat/current/tc5.5.x/STATUS.txt tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=730742&r1=730741&r2=730742&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Fri Jan 2 06:31:54 2009 @@ -162,3 +162,10 @@ https://issues.apache.org/bugzilla/attachment.cgi?id=23069 +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37458 + Correct sync issue that leads to NPE in rare circumstances + Patch provided by Konstantin Kolinko + http://svn.apache.org/viewvc?rev=730735&view=rev + +1: markt + -1: Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=730742&r1=730741&r2=730742&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 2 06:31:54 2009 @@ -262,3 +262,10 @@ http://svn.apache.org/viewvc?rev=730694&view=rev +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37458 + Correct sync issue that leads to NPE in rare circumstances + Patch provided by Konstantin Kolinko + http://svn.apache.org/viewvc?rev=730735&view=rev + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 37458] Datarace on org.apache.catalina.loader.WebappClassLoader
https://issues.apache.org/bugzilla/show_bug.cgi?id=37458 --- Comment #14 from Mark Thomas 2009-01-02 06:32:08 PST --- Thanks for the patch and your analysis. That makes perfect sense. I have applied your patch to trunk and proposed it for 6.0.x and 5.5.x. Thanks again. -- 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 46464] New: Serialisation issues in catalina
https://issues.apache.org/bugzilla/show_bug.cgi?id=46464 Summary: Serialisation issues in catalina Product: Tomcat 6 Version: unspecified Platform: All OS/Version: All Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: s...@apache.org The class org.apache.catalina.session.StandardSession defines the methods: protected void readObject(ObjectInputStream stream) protected void writeObject(ObjectOutputStream stream) But since the methods aren't declared private, they will be silently ignored by the serialization/deserialization API. == Furthermore, perhaps the methods should call defaultReadObject() / defaultWriteObject() respectively. The defaultxxxObject() methods are not called by the corresponding methods in the class org.apache.catalina.session.DeltaSession == The DeltaSession class additionally defines protected versions of readObject()/writeObject(). These should probably be removed or renamed to avoid confusion with the Java Serialisation API. -- 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: tcnative API stability/compatibility
Mark Thomas wrote: > Rainer Jung wrote: >> Hi, >> >> we now have tcnative 1.1.x and trunk. What's our goal w.r.t. API stability? > > My understanding was that trunk was created to introduce APR 1.3 and > that the result would be tcnative 1.2.x. APR 1.3 is abi compatible to 1.2 - although you famously adopt internal functions which have no API compatibility contract. If tcnative 1.2 is simply to demand APR 1.3 as a minimum version consuming some new API's, this make sense, but backporting to tcnative 1.1 would seem silly. Keep tcnative 1.2 abi-compatible to tcnative 1.1 (JNI perspective) and drop 1.1, start shipping 1.2 only. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 45996] allow byte serving with HTTP response header
https://issues.apache.org/bugzilla/show_bug.cgi?id=45996 Konstantin Kolinko changed: What|Removed |Added Summary|MIME type case insentive for|allow byte serving with HTTP |Tomcat and allow byte |response header |serving with HTTP response | |header | --- Comment #3 from Konstantin Kolinko 2009-01-02 08:37:58 PST --- There are two issues in OP's report. The 'making MIME type matching case insensitive' part of this issue is addressed as bug #45995. Thus I narrowed the Summary. -- 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 46464] Serialisation issues in catalina
https://issues.apache.org/bugzilla/show_bug.cgi?id=46464 Mark Thomas changed: What|Removed |Added Severity|normal |enhancement --- Comment #1 from Mark Thomas 2009-01-02 08:56:15 PST --- Whilst this may be non-intuitive I believe it is intentional. Some comments would probably help explain the thinking here. I don't see a failure in this report so marking this as an enhancement. -- 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 45995] RFE - MIME type extension not case sensitive
https://issues.apache.org/bugzilla/show_bug.cgi?id=45995 --- Comment #1 from Konstantin Kolinko 2009-01-02 08:59:04 PST --- For reference: In Apache HTTPD as of current 1.3 and 2.2 versions, the mime mappings are case-insensitive. See: http://httpd.apache.org/docs/2.2/en/mod/mod_mime.html http://httpd.apache.org/docs/1.3/mod/mod_mime.html esp. see the AddType and TypesConfig directives -- 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 42390] JSP compilation error with nested tagfile tags with variables with "AT_BEGIN" scope
https://issues.apache.org/bugzilla/show_bug.cgi?id=42390 --- Comment #1 from Konstantin Kolinko 2009-01-02 09:38:46 PST --- Created an attachment (id=23070) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=23070) ready-to-use WAR file that reproduces the issue -- 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 42390] JSP compilation error with nested tagfile tags with variables with "AT_BEGIN" scope
https://issues.apache.org/bugzilla/show_bug.cgi?id=42390 Konstantin Kolinko changed: What|Removed |Added Attachment #23070|application/octet-stream|application/zip mime type|| -- 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 42390] JSP compilation error with nested tagfile tags with variables with "AT_BEGIN" scope
https://issues.apache.org/bugzilla/show_bug.cgi?id=42390 Konstantin Kolinko changed: What|Removed |Added Version|5.5.23 |5.5.27 --- Comment #2 from Konstantin Kolinko 2009-01-02 09:48:48 PST --- I have arranged the OP's sources as a ready-to-use web application - that is the WAR file that I attached above. Using it I can reproduce the problem in the following TC versions: 5.5.27, 6.0.18 and the current tc6.0.x branch as at revision 730794 ( https://svn.apache.org/viewcvs.cgi?view=rev&rev=730794 ). Thus bumping the Version field. To reproduce: 1. Deploy the application 2. Access http://localhost:8080/bug42390/ 3. The following compilation error is displayed: (tc6.0.x) org.apache.jasper.JasperException: Unable to compile class for JSP: An error occurred at line: 99 in the generated java file _jspx_X_1 cannot be resolved ... Note: The tag file compiles fine. It is JSP that does not compile. -- 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: r730884 - in /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool: ProxyConnection.java interceptor/AbstractQueryReport.java
Author: fhanik
Date: Fri Jan 2 17:25:56 2009
New Revision: 730884
URL: http://svn.apache.org/viewvc?rev=730884&view=rev
Log:
Handle invocation target exceptions and throw the original exception when it
happens
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java?rev=730884&r1=730883&r2=730884&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
Fri Jan 2 17:25:56 2009
@@ -16,6 +16,7 @@
*/
package org.apache.tomcat.jdbc.pool;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.sql.Connection;
import java.sql.SQLException;
@@ -84,7 +85,16 @@
return connection.getConnection();
}
if (isClosed()) throw new SQLException("Connection has already been
closed.");
-return method.invoke(connection.getConnection(),args);
+try {
+return method.invoke(connection.getConnection(),args);
+}catch (Throwable t) {
+if (t instanceof InvocationTargetException) {
+InvocationTargetException it = (InvocationTargetException)t;
+throw it.getCause()!=null?it.getCause():it;
+} else {
+throw t;
+}
+}
}
public boolean isClosed() {
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java?rev=730884&r1=730883&r2=730884&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java
Fri Jan 2 17:25:56 2009
@@ -19,6 +19,7 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.sql.CallableStatement;
@@ -231,7 +232,12 @@
result = method.invoke(delegate,args);
}catch (Throwable t) {
reportFailedQuery(query,args,name,start,t);
-throw t;
+if (t instanceof InvocationTargetException) {
+InvocationTargetException it =
(InvocationTargetException)t;
+throw it.getCause()!=null?it.getCause():it;
+} else {
+throw t;
+}
}
//measure the time
long delta =
(process)?(System.currentTimeMillis()-start):Long.MIN_VALUE;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r730885 - /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
Author: fhanik
Date: Fri Jan 2 17:30:23 2009
New Revision: 730885
URL: http://svn.apache.org/viewvc?rev=730885&view=rev
Log:
Make system compile with JDK1.5
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java?rev=730885&r1=730884&r2=730885&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
Fri Jan 2 17:30:23 2009
@@ -42,7 +42,7 @@
}
public ConnectionPool(org.apache.tomcat.jdbc.pool.ConnectionPool pool,
boolean for16) {
-super(getDefaultNotificationInfo());
+super();
this.pool = pool;
}
@@ -61,8 +61,16 @@
@Override
public MBeanNotificationInfo[] getNotificationInfo() {
-return getDefaultNotificationInfo();
-}
+ MBeanNotificationInfo[] pres = super.getNotificationInfo();
+ MBeanNotificationInfo[] loc = getDefaultNotificationInfo();
+ MBeanNotificationInfo[] aug = new MBeanNotificationInfo[
+ pres.length + loc.length
+ ];
+ System.arraycopy(pres, 0, aug, 0, pres.length);
+ System.arraycopy(loc, 0, aug, pres.length+1, loc.length);
+
+return aug;
+}
public static MBeanNotificationInfo[] getDefaultNotificationInfo() {
String[] types = new String[] {NOTIFY_INIT, NOTIFY_CONNECT,
NOTIFY_ABANDON};
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r730893 - /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
Author: fhanik
Date: Fri Jan 2 18:34:10 2009
New Revision: 730893
URL: http://svn.apache.org/viewvc?rev=730893&view=rev
Log:
correct array math
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java?rev=730893&r1=730892&r2=730893&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
Fri Jan 2 18:34:10 2009
@@ -61,14 +61,11 @@
@Override
public MBeanNotificationInfo[] getNotificationInfo() {
- MBeanNotificationInfo[] pres = super.getNotificationInfo();
- MBeanNotificationInfo[] loc = getDefaultNotificationInfo();
- MBeanNotificationInfo[] aug = new MBeanNotificationInfo[
- pres.length + loc.length
- ];
- System.arraycopy(pres, 0, aug, 0, pres.length);
- System.arraycopy(loc, 0, aug, pres.length+1, loc.length);
-
+MBeanNotificationInfo[] pres = super.getNotificationInfo();
+MBeanNotificationInfo[] loc = getDefaultNotificationInfo();
+MBeanNotificationInfo[] aug = new MBeanNotificationInfo[pres.length +
loc.length];
+if (pres.length>0) System.arraycopy(pres, 0, aug, 0, pres.length);
+if (loc.length >0) System.arraycopy(loc, 0, aug,
pres.length>0?pres.length+1:0, loc.length);
return aug;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r730896 - in /tomcat/trunk/modules/jdbc-pool: build.xml sign.sh
Author: fhanik Date: Fri Jan 2 18:55:04 2009 New Revision: 730896 URL: http://svn.apache.org/viewvc?rev=730896&view=rev Log: update version Modified: tomcat/trunk/modules/jdbc-pool/build.xml tomcat/trunk/modules/jdbc-pool/sign.sh Modified: tomcat/trunk/modules/jdbc-pool/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=730896&r1=730895&r2=730896&view=diff == --- tomcat/trunk/modules/jdbc-pool/build.xml (original) +++ tomcat/trunk/modules/jdbc-pool/build.xml Fri Jan 2 18:55:04 2009 @@ -23,7 +23,7 @@ - + Modified: tomcat/trunk/modules/jdbc-pool/sign.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/sign.sh?rev=730896&r1=730895&r2=730896&view=diff == --- tomcat/trunk/modules/jdbc-pool/sign.sh (original) +++ tomcat/trunk/modules/jdbc-pool/sign.sh Fri Jan 2 18:55:04 2009 @@ -1,4 +1,4 @@ -VERSION=v1.0.13-beta +VERSION=v1.0.14-beta for i in $(find output/release/$VERSION -name "*.zip" -o -name "*.tar.gz"); do echo Signing $i echo $1|gpg --passphrase-fd 0 -a -b $i - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 42390] JSP compilation error with nested tagfile tags with variables with "AT_BEGIN" scope
https://issues.apache.org/bugzilla/show_bug.cgi?id=42390 --- Comment #3 from Konstantin Kolinko 2009-01-02 19:14:26 PST --- Created an attachment (id=23072) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=23072) patch for tc6.0.x that fixes the issue I am attaching patch that fixes the issue. It is against the tc6.0.x branch. The cause was that scripting var info of the nested Node.CustomTag was not populated by ScriptingVariableVisitor#setScriptingVars() call. It occurred because it thought that the variable was already declared, because it was present in ScriptingVariableVisitor#scriptVars, because the same instance of ScriptingVariableVisitor was used for the parent and child. -- 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: r730900 - /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
Author: fhanik Date: Fri Jan 2 19:14:50 2009 New Revision: 730900 URL: http://svn.apache.org/viewvc?rev=730900&view=rev Log: brain farts Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java?rev=730900&r1=730899&r2=730900&view=diff == --- tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java (original) +++ tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java Fri Jan 2 19:14:50 2009 @@ -65,7 +65,7 @@ MBeanNotificationInfo[] loc = getDefaultNotificationInfo(); MBeanNotificationInfo[] aug = new MBeanNotificationInfo[pres.length + loc.length]; if (pres.length>0) System.arraycopy(pres, 0, aug, 0, pres.length); -if (loc.length >0) System.arraycopy(loc, 0, aug, pres.length>0?pres.length+1:0, loc.length); +if (loc.length >0) System.arraycopy(loc, 0, aug, pres.length, loc.length); return aug; } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
