svn commit: r646212 - in /tomcat/connectors/trunk/jni: java/org/apache/tomcat/jni/Buffer.java native/src/bb.c
Author: mturk
Date: Wed Apr 9 00:50:52 2008
New Revision: 646212
URL: http://svn.apache.org/viewvc?rev=646212&view=rev
Log:
Add Buffer class for allocating ByteBuffers directly from the memory
Added:
tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/Buffer.java (with
props)
tomcat/connectors/trunk/jni/native/src/bb.c (with props)
Added: tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/Buffer.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/Buffer.java?rev=646212&view=auto
==
--- tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/Buffer.java (added)
+++ tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/Buffer.java Wed Apr
9 00:50:52 2008
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.tomcat.jni;
+
+import java.nio.ByteBuffer;
+
+/** Buffer
+ *
+ * @author Mladen Turk
+ * @version $Revision: $, $Date: $
+ */
+
+public class Buffer {
+
+/**
+ * Allocate a new ByteBuffer from memory
+ * @param size The amount of memory to allocate
+ * @return The ByteBuffer with allocated memory
+ */
+public static native ByteBuffer alloc(int size);
+
+/**
+ * Allocate a new ByteBuffer from memory and set all of the memory to 0
+ * @param num Number of elements.
+ * @param size Length in bytes of each element.
+ * @return The ByteBuffer with allocated memory
+ */
+public static native ByteBuffer calloc(int num, int size);
+
+/**
+ * Allocate a new ByteBuffer from a pool
+ * @param p The pool to allocate from
+ * @param size The amount of memory to allocate
+ * @return The ByteBuffer with allocated memory
+ */
+public static native ByteBuffer palloc(long p, int size);
+
+/**
+ * Allocate a new ByteBuffer from a pool and set all of the memory to 0
+ * @param p The pool to allocate from
+ * @param size The amount of memory to allocate
+ * @return The ByteBuffer with allocated memory
+ */
+public static native ByteBuffer pcalloc(long p, int size);
+
+/**
+ * Allocate a new ByteBuffer from already allocated memory.
+ * Allocated memory must be provided from call to the
+ * Stdlib.alloc or Stdlib.calloc methods.
+ * @param mem The memory to use
+ * @param size The amount of memory to use
+ * @return The ByteBuffer with attached memory
+ */
+public static native ByteBuffer create(long mem, int size);
+
+/**
+ * Deallocates or frees a memory block used by ByteBuffer
+ * Warning : Call this method only on ByteBuffers
+ * that were created by calling Buffer.alloc or Buffer.calloc.
+ * @param buf Previously allocated ByteBuffer to be freed.
+ */
+public static native void free(ByteBuffer buf);
+
+/**
+ * Returns the memory address of the ByteBuffer.
+ * @param buf Previously allocated ByteBuffer.
+ */
+public static native long address(ByteBuffer buf);
+
+/**
+ * Returns the allocated memory size of the ByteBuffer.
+ * @param buf Previously allocated ByteBuffer.
+ */
+public static native int size(ByteBuffer buf);
+
+}
Propchange: tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/Buffer.java
--
svn:eol-style = native
Added: tomcat/connectors/trunk/jni/native/src/bb.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/src/bb.c?rev=646212&view=auto
==
--- tomcat/connectors/trunk/jni/native/src/bb.c (added)
+++ tomcat/connectors/trunk/jni/native/src/bb.c Wed Apr 9 00:50:52 2008
@@ -0,0 +1,134 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a
DO NOT REPLY [Bug 44769] Add ByteBuffer creation method to org.apache. tomcat.jni.Stdlib
https://issues.apache.org/bugzilla/show_bug.cgi?id=44769 Mladen Turk <[EMAIL PROTECTED]> changed: What|Removed |Added Status|ASSIGNED|RESOLVED Resolution||FIXED --- Comment #2 from Mladen Turk <[EMAIL PROTECTED]> 2008-04-09 00:53:05 PST --- Commited to the trunk. See if the API fits the needs. Think we'll need the minor version bump for that new class -- 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44769] Add ByteBuffer creation method to org.apache. tomcat.jni.Stdlib
https://issues.apache.org/bugzilla/show_bug.cgi?id=44769 --- Comment #3 from Trustin Lee <[EMAIL PROTECTED]> 2008-04-09 01:14:49 PST --- I'm looking into here: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Stdlib.java?view=markup but couldn't find the change. Where's the correct location? -- 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44769] Add ByteBuffer creation method to org.apache. tomcat.jni.Stdlib
https://issues.apache.org/bugzilla/show_bug.cgi?id=44769 Trustin Lee <[EMAIL PROTECTED]> changed: What|Removed |Added Status|RESOLVED|CLOSED --- Comment #5 from Trustin Lee <[EMAIL PROTECTED]> 2008-04-09 02:59:02 PST --- Ah, it's here: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/Buffer.java?view=markup Looks very good to me! -- 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44769] Add ByteBuffer creation method to org.apache. tomcat.jni.Stdlib
https://issues.apache.org/bugzilla/show_bug.cgi?id=44769 --- Comment #4 from Remy Maucherat <[EMAIL PROTECTED]> 2008-04-09 02:45:07 PST --- It's in a new Buffer class, but I see no real reason for putting this stuff in a new class. -- 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
help regarding tomcat5.5.20 statring problem????????
hiii to all of you, I m new to tomcat i am using it for first time ,i ahve tomcat in compressed form i have extracted it into " c:\",now i set path="%PATH%";c:\jdk1.3.0_02\bin;.;" and i set classpath=%CLASSPATH%;c:\jdk1.3.0_02\lib;.; and set JAVA_HOME=c:\jdk1.3.0_02 and open command prompt and go to tomcat's bin directory and where i execute it's startup.bat batch file and after pressing enter new windiow open but it close before reading it and tomcat server did not run plzzz telll me if anyone know wat is the problem ,ymy server is not running when i have already set JAVA_HOME,, plzzz help me -- View this message in context: http://www.nabble.com/help-regarding-tomcat5.5.20-statring-problem-tp16584561p16584561.html Sent from the Tomcat - Dev mailing list archive at Nabble.com. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[EMAIL PROTECTED]: Project jakarta-tomcat-catalina (in module jakarta-tomcat-catalina) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at [EMAIL PROTECTED] Project jakarta-tomcat-catalina has an issue affecting its community integration. This issue affects 2 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - jakarta-tomcat-catalina : Servlet 2.4 Reference Implementation - jakarta-tomcat-jk : Connectors to various web servers Full details are available at: http://vmgump.apache.org/gump/public/jakarta-tomcat-catalina/jakarta-tomcat-catalina/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on ant exists, no need to add for property ant.home. -DEBUG- Dependency on jmx exists, no need to add for property jmx.home. -DEBUG- Dependency on jaf exists, no need to add for property activation.home. -DEBUG- Dependency on jakarta-tomcat-coyote exists, no need to add for property tomcat-coyote.home. -INFO- Failed with reason build failed -DEBUG- Extracted fallback artifacts from Gump Repository The following work was performed: http://vmgump.apache.org/gump/public/jakarta-tomcat-catalina/jakarta-tomcat-catalina/gump_work/build_jakarta-tomcat-catalina_jakarta-tomcat-catalina.html Work Name: build_jakarta-tomcat-catalina_jakarta-tomcat-catalina (Type: Build) Work ended in a state of : Failed Elapsed: 1 min 23 secs Command Line: /usr/lib/jvm/java-1.5.0-sun/bin/java -Djava.awt.headless=true -Xbootclasspath/p:/srv/gump/public/workspace/xml-xerces2/build/xercesImpl.jar:/srv/gump/public/workspace/xml-commons/java/external/build/xml-apis.jar:/srv/gump/public/workspace/xml-xalan/build/serializer.jar:/srv/gump/public/workspace/xml-xalan/build/xalan-unbundled.jar org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Dtomcat33.home=--UnSet-- -Dcatalina.build=/srv/gump/public/workspace/jakarta-tomcat-catalina/build -Djmx.home=/srv/gump/packages/jmx-1_2_1-bin -Djdbc20ext.jar=/srv/gump/packages/jdbc2_0/jdbc2_0-stdext.jar -Djtc.home=/srv/gump/public/workspace/jakarta-tomcat-connectors -Djasper.home=/srv/gump/public/workspace/jakarta-tomcat-jasper_tc5 -Dant.home=/srv/gump/public/workspace/ant/dist -Dcompile.source=1.4 -Dcommons-collections.jar=/srv/gump/public/workspace/apache-commons/collections/build/commons-collections-08042008.jar -Dcatalina.deploy =/srv/gump/public/workspace/jakarta-tomcat-catalina/build -Djaas.jar=/srv/gump/packages/jaas1_0/lib/jaas.jar -Dcommons-fileupload.jar=/srv/gump/public/workspace/apache-commons/fileupload/target/commons-fileupload-08042008.jar -Dcommons-digester.jar=/srv/gump/public/workspace/apache-commons/digester/dist/commons-digester.jar -Dtomcat-http11.jar=/srv/gump/public/workspace/jakarta-tomcat-connectors/http11/build/lib/tomcat-http11.jar -Dactivation.home=/srv/gump/packages/jaf-1.1ea -Dcatalina.home=/srv/gump/public/workspace/jakarta-tomcat-catalina/build -Dcommons-launcher.jar=/srv/gump/public/workspace/apache-commons/launcher/dist/bin/commons-launcher-08042008.jar -Dtomcat.build=/srv/gump/public/workspace/jakarta-tomcat-catalina/build -Dcommons-beanutils.jar=/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-08042008.jar -Dcommons-modeler.jar=/srv/gump/public/workspace/apache-commons/modeler/dist/commons-modeler-08042008.jar -Dtomcat-coyote.home=/srv/gump/p ublic/workspace/jakarta-tomcat-connectors/coyote -Djmx-remote.jar=/srv/gump/packages/jmxremote-1_0_1-bin/lib/jmxremote.jar -Dcommons-logging-api.jar=/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-08042008.jar -Dtomcat-dbcp.jar=/srv/gump/public/workspace/jakarta-tomcat-5/tomcat-deps/naming-factory-dbcp.jar -Djta.jar=/srv/gump/packages/jta-spec1_0_1/jta-spec1_0_1.jar deploy-catalina [Working Directory: /srv/gump/public/workspace/jakarta-tomcat-catalina] CLASSPATH: /usr/lib/jvm/java-1.5.0-sun/lib/tools.jar:/srv/gump/public/workspace/jakarta-tomcat-catalina/build/server/classes:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-trax.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-nodeps.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/xml-commons/java/external/build/xml-apis-ext.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jmx-1_2_1-bin/lib/jmxri.jar:/srv/gump/packages/jmx-1_2_1-bin/lib/jmxtools.jar:/s
Re: svn commit: r646121 - /tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
[EMAIL PROTECTED] schrieb:
--- tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Tue Apr 8 15:52:49
2008
@@ -49,7 +49,7 @@
#include
-#define VERSION_STRING "Jakarta/ISAPI/" JK_VERSTRING
+#define VERSION_STRING "Jakarta/ISAPI/" JK_EXPOSED_VERSION
#define SHM_DEF_NAME "JKISAPISHMEM"
#define DEFAULT_WORKER_NAME ("ajp13")
@@ -1799,9 +1799,7 @@
}
}
if (rc) {
-jk_log(logger, JK_LOG_INFO,
- "isapi_redirect/%s initialized",
- JK_VERSTRING);
+jk_log(logger, JK_LOG_INFO, "Initialized %s", (VERSION_STRING) );
I would prefer to keep the init messages for mod_jk/isapi/nsapi more
consistent. So adding "-dev" etc. is fine, but before we used
"mod_jk/something initialized", "isapi_redirect/something initialized",
"nsapi_redirector/something initialized".
Guess I'm going to define PACKAGE in iis and nsapi appropriately, s.t.
JK_EXPOSED_VERSION automatically contains the correct plugin name and we
can switch back to a uniform log format. I'll have a look later today.
}
return rc;
}
Thanks for applying the patch nevertheless :)
Rainer
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44785] New: Documentation f the MaxThread default value for AJP connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=44785 Summary: Documentation f the MaxThread default value for AJP connector Product: Tomcat 6 Version: 6.0.16 Platform: PC URL: http://tomcat.apache.org/tomcat-6.0-doc/config/ajp.html OS/Version: Linux Status: NEW Severity: trivial Priority: P5 Component: Documentation AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Hello, The maxThread value of the AJP connector is 200 by default. But the documentation indicates a value of 40 which is wrong AJP connector uses the org.apache.tomcat.util.threads the set up this value. - maxThreads The maximum number of request processing threads to be created by this Connector, which therefore determines the maximum number of simultaneous requests that can be handled. If not specified, this attribute is set to 40. If an executor is associated with this connector, this attribute is ignored as the connector will execute tasks using the executor rather than an internal thread pool. - Thanks, Lionel -- 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44787] New: provide more error context on "java.lang. IllegalStateException: No Java compiler available"
https://issues.apache.org/bugzilla/show_bug.cgi?id=44787 Summary: provide more error context on "java.lang.IllegalStateException: No Java compiler available" Product: Tomcat 6 Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: Jasper AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] CC: [EMAIL PROTECTED] when manually attempting to pre-compile jsp pages, I get on debian etch [jasper2] java.lang.IllegalStateException: No Java compiler available [jasper2] at org.apache.jasper.JspCompilationContext.createCompiler(JspCompilationContext.java:224) [jasper2] at org.apache.jasper.JspC.processFile(JspC.java:979) [jasper2] at org.apache.jasper.JspC.execute(JspC.java:1135) There appear to be 2 method variants to do this: a) Compiler createCompiler(String className) doesn't bother to say which "className" it was looking for in case of a failure b) nor does it volunteer to cite the classpath it was looking for the org.apache.jasper.compiler.JDTCompiler or org.apache.jasper.compiler.AntCompiler (or the one specified in the "options" in the future) -- 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r646408 - in /tomcat/connectors/trunk/jk/native: iis/Makefile.amd64 iis/Makefile.ia64 iis/Makefile.x86 iis/isapi.dsp netscape/Makefile.linux netscape/Makefile.netware netscape/Makefile.sol
Author: rjung
Date: Wed Apr 9 08:40:04 2008
New Revision: 646408
URL: http://svn.apache.org/viewvc?rev=646408&view=rev
Log:
Add new defines JK_ISAPI and JK_NSAPI to build process.
We'll use them to decide on the module name used during
startup initialize log message.
Modified:
tomcat/connectors/trunk/jk/native/iis/Makefile.amd64
tomcat/connectors/trunk/jk/native/iis/Makefile.ia64
tomcat/connectors/trunk/jk/native/iis/Makefile.x86
tomcat/connectors/trunk/jk/native/iis/isapi.dsp
tomcat/connectors/trunk/jk/native/netscape/Makefile.linux
tomcat/connectors/trunk/jk/native/netscape/Makefile.netware
tomcat/connectors/trunk/jk/native/netscape/Makefile.solaris
tomcat/connectors/trunk/jk/native/netscape/nsapi.dsp
Modified: tomcat/connectors/trunk/jk/native/iis/Makefile.amd64
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/Makefile.amd64?rev=646408&r1=646407&r2=646408&view=diff
==
--- tomcat/connectors/trunk/jk/native/iis/Makefile.amd64 (original)
+++ tomcat/connectors/trunk/jk/native/iis/Makefile.amd64 Wed Apr 9 08:40:04
2008
@@ -103,7 +103,7 @@
IF EXIST $(OUTDIR)\isapi_redirect.manifest \
mt -nologo -manifest $(OUTDIR)\isapi_redirect.manifest
-outputresource:$(OUTDIR)\isapi_redirect.dll;2
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\common" /I "pcre" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG"
/D "_WINDOWS" /D "_AMD64_=1" -DWIN64 /D "_WIN64" /Wp64 /FIPRE64PRA.H /D
"ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC" /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\isapi_redirector_src" /FD /c
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\common" /I "pcre" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG"
/D "_WINDOWS" /D "_AMD64_=1" -DWIN64 /D "_WIN64" /Wp64 /FIPRE64PRA.H /D
"JK_ISAPI" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC" /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\isapi_redirector_src" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
Modified: tomcat/connectors/trunk/jk/native/iis/Makefile.ia64
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/Makefile.ia64?rev=646408&r1=646407&r2=646408&view=diff
==
--- tomcat/connectors/trunk/jk/native/iis/Makefile.ia64 (original)
+++ tomcat/connectors/trunk/jk/native/iis/Makefile.ia64 Wed Apr 9 08:40:04 2008
@@ -118,7 +118,7 @@
IF EXIST $(OUTDIR)\isapi_redirect.manifest \
mt -nologo -manifest $(OUTDIR)\isapi_redirect.manifest
-outputresource:$(OUTDIR)\isapi_redirect.dll;2
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\common" /I "pcre" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG"
/D "_WINDOWS" /D "_IA64_=1" -DWIN64 /D "_WIN64" /Wp64 /FIPRE64PRA.H /D
"ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC" /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\isapi_redirector_src" /FD /c
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\common" /I "pcre" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG"
/D "_WINDOWS" /D "_IA64_=1" -DWIN64 /D "_WIN64" /Wp64 /FIPRE64PRA.H /D
"JK_ISAPI" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC" /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\isapi_redirector_src" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
Modified: tomcat/connectors/trunk/jk/native/iis/Makefile.x86
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/Makefile.x86?rev=646408&r1=646407&r2=646408&view=diff
==
--- tomcat/connectors/trunk/jk/native/iis/Makefile.x86 (original)
+++ tomcat/connectors/trunk/jk/native/iis/Makefile.x86 Wed Apr 9 08:40:04 2008
@@ -111,7 +111,7 @@
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\common" /I "pcre" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG"
/D "_WINDOWS" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC"
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\isapi_redirector_src" /FD /c
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\common" /I "pcre" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG"
/D "_WINDOWS" /D "JK_ISAPI" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC"
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\isapi_redirector_src" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
Modified: tomcat/connectors/trunk/jk/native/iis/isapi.dsp
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/isapi.dsp?rev=646408&r1=646407&r2=646408&view=diff
==
--- tomcat/connectors/trunk/jk/native/iis/isapi.dsp (original)
+++ tomcat/connectors/trunk/jk/native/iis/isapi.dsp Wed Apr 9 08:40:04 2008
@@ -42,8 +42,8 @@
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "ND
svn commit: r646411 - in /tomcat/connectors/trunk/jk: native/common/jk_version.h native/iis/jk_isapi_plugin.c native/netscape/jk_nsapi_plugin.c xdocs/miscellaneous/changelog.xml
Author: rjung
Date: Wed Apr 9 08:44:48 2008
New Revision: 646411
URL: http://svn.apache.org/viewvc?rev=646411&view=rev
Log:
Use new defines JK_ISAPI and JK_NSAPI to set
plugin name in exposed version string.
Make startup message more consistent between plugins.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_version.h
tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/connectors/trunk/jk/native/common/jk_version.h
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_version.h?rev=646411&r1=646410&r2=646411&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_version.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_version.h Wed Apr 9 08:44:48
2008
@@ -40,7 +40,13 @@
/** END OF AREA TO MODIFY BEFORE RELEASING */
#if !defined(PACKAGE)
+#if defined(JK_ISAPI)
+#define PACKAGE "isapi_redirector"
+#elif defined(JK_NSAPI)
+#define PACKAGE "nsapi_redirector"
+#else
#define PACKAGE "mod_jk"
+#endif
#endif
/* Build JK_EXPOSED_VERSION and JK_VERSION */
Modified: tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c?rev=646411&r1=646410&r2=646411&view=diff
==
--- tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Wed Apr 9 08:44:48
2008
@@ -1799,7 +1799,7 @@
}
}
if (rc) {
-jk_log(logger, JK_LOG_INFO, "Initialized %s", (VERSION_STRING) );
+jk_log(logger, JK_LOG_INFO, "%s initialized", (VERSION_STRING) );
}
return rc;
}
Modified: tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c?rev=646411&r1=646410&r2=646411&view=diff
==
--- tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c Wed Apr 9
08:44:48 2008
@@ -303,8 +303,7 @@
if (init_on_other_thread_is_done && init_on_other_thread_is_ok) {
magnus_atrestart(jk_term, NULL);
rc = REQ_PROCEED;
-jk_log(logger, JK_LOG_INFO, "nsapi_redirector/%s initialized",
- JK_VERSTRING);
+jk_log(logger, JK_LOG_INFO, "%s initialized",
JK_EXPOSED_VERSION);
}
/*if(wc_open(init_map, NULL, logger)) {
Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=646411&r1=646410&r2=646411&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Wed Apr 9
08:44:48 2008
@@ -43,6 +43,10 @@
+
+Detect correct plugin name for various web servers via additional
+preprocessor defines. (rjung)
+
44738: Fix merging of JkOption ForwardURI* between virtual
hosts.
Patch contributed by Toshihiro Sasajima. (rjung)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: help regarding tomcat5.5.20 statring problem????????
abhu_05 wrote: hiii to all of you, I m new to tomcat i am using it for first time ,i ahve tomcat in compressed form i have extracted it into " c:\",now i set path="%PATH%";c:\jdk1.3.0_02\bin;.;" and i set classpath=%CLASSPATH%;c:\jdk1.3.0_02\lib;.; and set JAVA_HOME=c:\jdk1.3.0_02 and open command prompt and go to tomcat's bin directory and where i execute it's startup.bat batch file and after pressing enter new windiow open but it close before reading it and tomcat server did not run plzzz telll me if anyone know wat is the problem ,ymy server is not running when i have already set JAVA_HOME,, plzzz help me Please use the users list. http://tomcat.apache.org/lists.html Mark - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44788] New: Container parent property availability
https://issues.apache.org/bugzilla/show_bug.cgi?id=44788
Summary: Container parent property availability
Product: Tomcat 5
Version: 5.5.17
Platform: PC
OS/Version: Windows XP
Status: NEW
Severity: trivial
Priority: P2
Component: Catalina
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]
With a custom realm deployed in a CONTEXT the related container and the parent
container (Container.getParent()) are available on the Realm.setContainer()
call. When the realm is deployed in a HOST the container is available in the
Realm.setContainer() but the parent container (Container.getParent()) returns
null. The parent container reference does become available later (on an
authenticate() call for example).
Example: the following code behaves differently depending on whether the
container is a HOST or a CONTEXT:
public void setContainer(Container container)
{
this.container = container;
if (container != null)
{
// parentContainer is null if container is a HOST
parentContainer = container.getParent();
...
Workaround is to retain the container reference and calls its getParent() after
initialization.
--
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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: help regarding tomcat5.5.20 statring problem????????
http://mx.youtube.com/watch?v=cJr16hbfBU0 Nuestros Derechos estan limitados por los Derechos de los demas - ¡Capacidad ilimitada de almacenamiento en tu correo! No te preocupes más por el espacio de tu cuenta con Correo Yahoo!: http://correo.yahoo.com.mx/
svn commit: r646543 - /tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
Author: markt
Date: Wed Apr 9 14:19:02 2008
New Revision: 646543
URL: http://svn.apache.org/viewvc?rev=646543&view=rev
Log:
Handle case where we don't have permission to read context specific
configuration.
Modified:
tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
Modified: tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=646543&r1=646542&r2=646543&view=diff
==
--- tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java (original)
+++ tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java Wed Apr 9
14:19:02 2008
@@ -22,6 +22,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URLClassLoader;
+import java.security.AccessControlException;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Collections;
@@ -296,9 +297,14 @@
InputStream is = null;
// Special case for URL classloaders which are used in containers:
// only look in the local repositories to avoid redefining loggers 20
times
-if ((classLoader instanceof URLClassLoader)
-&& (((URLClassLoader)
classLoader).findResource("logging.properties") != null)) {
-is = classLoader.getResourceAsStream("logging.properties");
+try {
+if ((classLoader instanceof URLClassLoader)
+&& (((URLClassLoader)
classLoader).findResource("logging.properties") != null)) {
+is = classLoader.getResourceAsStream("logging.properties");
+}
+} catch (AccessControlException ace) {
+// No permission to configure logging in context
+// Ignore and carry on
}
if ((is == null) && (classLoader ==
ClassLoader.getSystemClassLoader())) {
String configFileStr =
System.getProperty("java.util.logging.config.file");
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r646545 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Apr 9 14:21:55 2008 New Revision: 646545 URL: http://svn.apache.org/viewvc?rev=646545&view=rev Log: Propose patch 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=646545&r1=646544&r2=646545&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Apr 9 14:21:55 2008 @@ -102,3 +102,8 @@ http://svn.apache.org/viewvc?rev=645722&view=rev (mark/reset fix) +1: markt, fhanik -1: + +* Better handling of lack of permission for context specific logging + http://svn.apache.org/viewvc?rev=646543&view=rev + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r646550 - /tomcat/trunk/conf/catalina.policy
Author: markt
Date: Wed Apr 9 14:29:42 2008
New Revision: 646550
URL: http://svn.apache.org/viewvc?rev=646550&view=rev
Log:
Additional permission needed to read JDK logging config.
Modified:
tomcat/trunk/conf/catalina.policy
Modified: tomcat/trunk/conf/catalina.policy
URL:
http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.policy?rev=646550&r1=646549&r2=646550&view=diff
==
--- tomcat/trunk/conf/catalina.policy (original)
+++ tomcat/trunk/conf/catalina.policy Wed Apr 9 14:29:42 2008
@@ -64,6 +64,7 @@
grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" {
permission java.util.PropertyPermission
"java.util.logging.config.class", "read";
permission java.util.PropertyPermission
"java.util.logging.config.file", "read";
+permission java.io.FilePermission
"${java.home}${file.separator}lib${file.separator}logging.properties", "read";
permission java.lang.RuntimePermission "shutdownHooks";
permission java.io.FilePermission
"${catalina.base}${file.separator}conf${file.separator}logging.properties",
"read";
permission java.util.PropertyPermission "catalina.base", "read";
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r646553 - /tomcat/current/tc5.5.x/STATUS.txt
Author: markt Date: Wed Apr 9 14:32:37 2008 New Revision: 646553 URL: http://svn.apache.org/viewvc?rev=646553&view=rev Log: Port a couple of proposals. 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=646553&r1=646552&r2=646553&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Wed Apr 9 14:32:37 2008 @@ -110,3 +110,13 @@ http://svn.apache.org/viewvc?rev=645722&view=rev (mark/reset fix) +1: markt -1: + +* Better handling of lack of permission for context specific logging + http://svn.apache.org/viewvc?rev=646543&view=rev + +1: markt + -1: + +* Additional permission required to read JDK logging config + http://svn.apache.org/viewvc?rev=646550&view=rev + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r646554 - /tomcat/current/tc5.5.x/STATUS.txt
Author: markt Date: Wed Apr 9 14:35:35 2008 New Revision: 646554 URL: http://svn.apache.org/viewvc?rev=646554&view=rev Log: Fix for change in jar name 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=646554&r1=646553&r2=646554&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Wed Apr 9 14:35:35 2008 @@ -120,3 +120,8 @@ http://svn.apache.org/viewvc?rev=646550&view=rev +1: markt -1: + +* Change of jar name for policy file + http://people.apache.org/~markt/patches/2008-04-09-policy.patch + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r646555 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: remm Date: Wed Apr 9 14:37:30 2008 New Revision: 646555 URL: http://svn.apache.org/viewvc?rev=646555&view=rev Log: - Votes. 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=646555&r1=646554&r2=646555&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Apr 9 14:37:30 2008 @@ -91,7 +91,7 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44595 http://svn.apache.org/viewvc?view=rev&revision=645428 - +1: jfclere, rjung, fhanik + +1: jfclere, rjung, fhanik, remm -1: * Final fixes for https://issues.apache.org/bugzilla/show_bug.cgi?id=44494 @@ -100,15 +100,15 @@ cases I could think of. http://svn.apache.org/viewvc?rev=645719&view=rev (Remy's resizing fix) http://svn.apache.org/viewvc?rev=645722&view=rev (mark/reset fix) - +1: markt, fhanik + +1: markt, fhanik, remm -1: * Better handling of lack of permission for context specific logging http://svn.apache.org/viewvc?rev=646543&view=rev - +1: markt + +1: markt, remm -1: * Additional permission required to read JDK logging config http://svn.apache.org/viewvc?rev=646550&view=rev - +1: markt + +1: markt, remm -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44787] provide more error context on "java.lang. IllegalStateException: No Java compiler available"
https://issues.apache.org/bugzilla/show_bug.cgi?id=44787 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Severity|normal |enhancement --- Comment #1 from Mark Thomas <[EMAIL PROTECTED]> 2008-04-09 14:35:31 PST --- Patches are always welcome. -- 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r646559 - /tomcat/trunk/webapps/docs/config/ajp.xml
Author: markt Date: Wed Apr 9 14:59:05 2008 New Revision: 646559 URL: http://svn.apache.org/viewvc?rev=646559&view=rev Log: Fix bug 44785. Correct deafult maxThreads for AJP connector. Modified: tomcat/trunk/webapps/docs/config/ajp.xml Modified: tomcat/trunk/webapps/docs/config/ajp.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/ajp.xml?rev=646559&r1=646558&r2=646559&view=diff == --- tomcat/trunk/webapps/docs/config/ajp.xml (original) +++ tomcat/trunk/webapps/docs/config/ajp.xml Wed Apr 9 14:59:05 2008 @@ -253,7 +253,7 @@ The maximum number of request processing threads to be created by this Connector, which therefore determines the maximum number of simultaneous requests that can be handled. If - not specified, this attribute is set to 40. If an executor is associated + not specified, this attribute is set to 200. If an executor is associated with this connector, this attribute is ignored as the connector will execute tasks using the executor rather than an internal thread pool. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r646552 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Apr 9 14:31:57 2008 New Revision: 646552 URL: http://svn.apache.org/viewvc?rev=646552&view=rev Log: Another proposal. 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=646552&r1=646551&r2=646552&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Apr 9 14:31:57 2008 @@ -107,3 +107,8 @@ http://svn.apache.org/viewvc?rev=646543&view=rev +1: markt -1: + +* Additional permission required to read JDK logging config + http://svn.apache.org/viewvc?rev=646550&view=rev + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44785] Documentation f the MaxThread default value for AJP connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=44785 --- Comment #1 from Mark Thomas <[EMAIL PROTECTED]> 2008-04-09 14:58:27 PST --- This has been fixed in trunk and proposed for 6.0.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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r646560 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Apr 9 15:01:53 2008 New Revision: 646560 URL: http://svn.apache.org/viewvc?rev=646560&view=rev Log: Propose fix. 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=646560&r1=646559&r2=646560&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Apr 9 15:01:53 2008 @@ -112,3 +112,9 @@ http://svn.apache.org/viewvc?rev=646550&view=rev +1: markt, remm -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44785 + Correct default maxThreads for AJP connector + http://svn.apache.org/viewvc?rev=646559&view=rev + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44788] Container parent property availability
https://issues.apache.org/bugzilla/show_bug.cgi?id=44788 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Mark Thomas <[EMAIL PROTECTED]> 2008-04-09 15:16:10 PST --- This is a side-effect of how the digester works and the order objects are created. When setContainer() is called, state is not fully configured. When the init() method is called, the container hierarchy is correctly set. -- 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r646571 - in /tomcat/trunk/java/org/apache/el: lang/ELArithmetic.java lang/ELSupport.java parser/AstNegative.java
Author: markt
Date: Wed Apr 9 15:29:28 2008
New Revision: 646571
URL: http://svn.apache.org/viewvc?rev=646571&view=rev
Log:
Clean up type checking code. Patch provided by Konstantin Kolinko.
Modified:
tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java
tomcat/trunk/java/org/apache/el/lang/ELSupport.java
tomcat/trunk/java/org/apache/el/parser/AstNegative.java
Modified: tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java?rev=646571&r1=646570&r2=646571&view=diff
==
--- tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java Wed Apr 9 15:29:28
2008
@@ -164,8 +164,6 @@
|| obj1 instanceof Double
|| obj0 instanceof Float
|| obj1 instanceof Float
-|| (obj0 != null && (Double.TYPE == obj0.getClass() ||
Float.TYPE == obj0.getClass()))
-|| (obj1 != null && (Double.TYPE == obj1.getClass() ||
Float.TYPE == obj1.getClass()))
|| (obj0 instanceof String && ELSupport
.isStringFloat((String) obj0)) || (obj1 instanceof
String && ELSupport
.isStringFloat((String) obj1)));
@@ -362,13 +360,12 @@
return coerce(ZERO);
}
-Class objType = obj.getClass();
-if (Character.class.equals(objType) || Character.TYPE == objType) {
+if (obj instanceof Character) {
return coerce(new Short((short) ((Character) obj).charValue()));
}
throw new IllegalArgumentException(MessageFactory.get("error.convert",
-obj, objType, "Number"));
+obj, obj.getClass(), "Number"));
}
protected abstract Number coerce(final String str);
Modified: tomcat/trunk/java/org/apache/el/lang/ELSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/ELSupport.java?rev=646571&r1=646570&r2=646571&view=diff
==
--- tomcat/trunk/java/org/apache/el/lang/ELSupport.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/ELSupport.java Wed Apr 9 15:29:28 2008
@@ -164,7 +164,7 @@
if (obj == null || "".equals(obj)) {
return Boolean.FALSE;
}
-if (obj instanceof Boolean || obj.getClass() == Boolean.TYPE) {
+if (obj instanceof Boolean) {
return (Boolean) obj;
}
if (obj instanceof String) {
@@ -187,7 +187,7 @@
return new Character((char) ((Number) obj).shortValue());
}
Class objType = obj.getClass();
-if (obj instanceof Character || objType == Character.TYPE) {
+if (obj instanceof Character) {
return (Character) obj;
}
@@ -259,14 +259,13 @@
return coerceToNumber((Number) obj, type);
}
-Class objType = obj.getClass();
-if (Character.class.equals(objType) || Character.TYPE == objType) {
+if (obj instanceof Character) {
return coerceToNumber(new Short((short) ((Character) obj)
.charValue()), type);
}
throw new IllegalArgumentException(MessageFactory.get("error.convert",
-obj, objType, type));
+obj, obj.getClass(), type));
}
protected final static Number coerceToNumber(final String val,
@@ -402,10 +401,7 @@
return (obj0 instanceof Double
|| obj1 instanceof Double
|| obj0 instanceof Float
-|| obj1 instanceof Float
-|| (obj0 != null && (Double.TYPE == obj0.getClass() ||
Float.TYPE == obj0
-.getClass())) || (obj1 != null && (Double.TYPE == obj1
-.getClass() || Float.TYPE == obj1.getClass(;
+|| obj1 instanceof Float);
}
public final static boolean isDoubleStringOp(final Object obj0,
@@ -424,17 +420,7 @@
|| obj0 instanceof Short
|| obj1 instanceof Short
|| obj0 instanceof Byte
-|| obj1 instanceof Byte
-|| (obj0 != null && (Long.TYPE == obj0.getClass()
-|| Integer.TYPE == obj0.getClass()
-|| Character.TYPE == obj0.getClass()
-|| Short.TYPE == obj0.getClass() || Byte.TYPE == obj0
-.getClass())) || (obj0 != null && (Long.TYPE == obj0
-.getClass()
-|| Integer.TYPE == obj0.getClass()
-|| Character.TYPE == obj0.getClass()
-|| Short.TYPE == obj0.getClass() || Byte.TYPE == obj0
-.getClass(;
+|| obj1 instanceof Byte);
}
public final
svn commit: r646572 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Apr 9 15:31:02 2008 New Revision: 646572 URL: http://svn.apache.org/viewvc?rev=646572&view=rev Log: Propose some clean up 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=646572&r1=646571&r2=646572&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Apr 9 15:31:02 2008 @@ -118,3 +118,8 @@ http://svn.apache.org/viewvc?rev=646559&view=rev +1: markt -1: + +* Clean up type checking code. Patch provided by Konstantin Kolinko. + http://svn.apache.org/viewvc?rev=646571&view=rev + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r646574 - /tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
Author: markt
Date: Wed Apr 9 15:33:01 2008
New Revision: 646574
URL: http://svn.apache.org/viewvc?rev=646574&view=rev
Log:
Fix bug 44428. Make sure m is not null to prevent NPE.
Modified:
tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
Modified: tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java?rev=646574&r1=646573&r2=646574&view=diff
==
--- tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java Wed Apr 9
15:33:01 2008
@@ -120,6 +120,8 @@
public void writeExternal(ObjectOutput out) throws IOException {
out.writeUTF((this.prefix != null) ? this.prefix : "");
out.writeUTF(this.localName);
+// make sure m isn't null
+getMethod();
out.writeUTF((this.owner != null) ?
this.owner :
this.m.getDeclaringClass().getName());
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44428] FunctionMapperImpl. Function throws a NPE in certain circumstances
https://issues.apache.org/bugzilla/show_bug.cgi?id=44428 --- Comment #1 from Mark Thomas <[EMAIL PROTECTED]> 2008-04-09 15:31:05 PST --- Fixed in trunk with a different patch. I went with simple that didn't duplicate code. I have proposed the patch for 6.0.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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r646576 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Apr 9 15:34:55 2008 New Revision: 646576 URL: http://svn.apache.org/viewvc?rev=646576&view=rev Log: Propose NPE fix 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=646576&r1=646575&r2=646576&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Apr 9 15:34:55 2008 @@ -123,3 +123,9 @@ http://svn.apache.org/viewvc?rev=646571&view=rev +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44428 + Prevent NPE + http://svn.apache.org/viewvc?rev=646574&view=rev + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43285] Missing EL Coercion causes argument type mismatch
https://issues.apache.org/bugzilla/show_bug.cgi?id=43285 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #8 from Mark Thomas <[EMAIL PROTECTED]> 2008-04-09 15:37:17 PST --- Changing back to fixed based on previous comment. -- 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r646605 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: remm Date: Wed Apr 9 17:34:45 2008 New Revision: 646605 URL: http://svn.apache.org/viewvc?rev=646605&view=rev Log: - Votes. 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=646605&r1=646604&r2=646605&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Apr 9 17:34:45 2008 @@ -116,16 +116,17 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44785 Correct default maxThreads for AJP connector http://svn.apache.org/viewvc?rev=646559&view=rev - +1: markt + +1: markt, remm -1: * Clean up type checking code. Patch provided by Konstantin Kolinko. http://svn.apache.org/viewvc?rev=646571&view=rev +1: markt + -0: remm (44766: the first patch http://svn.apache.org/viewvc?rev=646106&view=rev is not mentioned ?) -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44428 Prevent NPE http://svn.apache.org/viewvc?rev=646574&view=rev - +1: markt + +1: markt, remm -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
