Re: svn commit: r521417 - /tomcat/connectors/trunk/jk/native/common/jk_util.c

[Rainer Jung]

I think I added those after I was frustrated by a customer whose mod_jk 
logs had all non-windows line endings. Sorry, I didn't really test your 
change, but my experience questions this patch.


Do we need to set text mode on the file? Will this work for direct logs 
and piped logs?


Regards,

Rainer

[EMAIL PROTECTED] wrote:

Author: mturk
Date: Thu Mar 22 12:35:34 2007
New Revision: 521417

URL: http://svn.apache.org/viewvc?view=rev&rev=521417
Log:
Fix windows logging. There is no need to add the extra \r, because windows by 
default adds them for any text files.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_util.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.c?view=diff&rev=521417&r1=521416&r2=521417
==
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Thu Mar 22 12:35:34 2007
@@ -397,18 +397,14 @@
 if (l &&
 (l->level <= level || level == JK_LOG_REQUEST_LEVEL) &&
 l->logger_private && what) {
-size_t sz = strlen(what);
-if (sz) {
-file_logger_t *p = l->logger_private;
-if (fwrite(what, 1, sz, p->logfile)) {
-/* [V] Flush the dam' thing! */
-fflush(p->logfile);
-}
+file_logger_t *p = l->logger_private;
+if (p->logfile) {
+fputs(what, p->logfile);
+/* [V] Flush the dam' thing! */
+fflush(p->logfile);
 }
-
 return JK_TRUE;
 }
-
 return JK_FALSE;
 }
 
@@ -444,6 +440,7 @@

 int jk_open_file_logger(jk_logger_t **l, const char *file, int level)
 {
 if (l && file) {
+
 jk_logger_t *rc = (jk_logger_t *)malloc(sizeof(jk_logger_t));
 file_logger_t *p = (file_logger_t *) malloc(sizeof(file_logger_t));
 if (rc && p) {
@@ -496,11 +493,7 @@
 {
 int rc = 0;
 /* Need to reserve space for newline and terminating zero byte. */
-#ifdef WIN32
-static int usable_size = HUGE_BUFFER_SIZE-3;
-#else
 static int usable_size = HUGE_BUFFER_SIZE-2;
-#endif
 if (!l || !file || !fmt) {
 return -1;
 }
@@ -577,17 +570,14 @@
 #else
 rc = vsnprintf(buf + used, usable_size - used, fmt, args);
 #endif
+va_end(args);
 if ( rc <= usable_size - used ) {
 used += rc;
 } else {
 used = usable_size;
 }
-#ifdef WIN32
-buf[used++] = '\r';
-#endif
-buf[used] = '\n';
-buf[used+1] = 0;
-va_end(args);
+buf[used++] = '\n';
+buf[used] = 0;
 l->log(l, level, buf);
 #ifdef NETWARE
 free(buf);


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

DO NOT REPLY [Bug 41070] - Autodeployer takes war file while it is not yet fully written

[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=41070


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|WONTFIX |




--- Additional Comments From [EMAIL PROTECTED]  2007-03-26 01:49 ---
I'd leave it open. Simply because It's a bug. Yes it has workarounds, but It
leaves it a bug.

-- 
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]

Re: svn commit: r521417 - /tomcat/connectors/trunk/jk/native/common/jk_util.c

[Mladen Turk]

Rainer Jung wrote:
I think I added those after I was frustrated by a customer whose mod_jk 
logs had all non-windows line endings. Sorry, I didn't really test your 
change, but my experience questions this patch.




With you patch the line endings were \r,\r,\n


Do we need to set text mode on the file? Will this work for direct logs 
and piped logs?




Text mode is default unless you open the file with "ab+"
The "b" standing for binary.

Probably not. The logs will have \n line endings unless
the log rotator itself mangles them.

Anyhow, either we can have binary files (using read/write)
instead stdio for logs, and use platform specific lineends,
or depend on the stdio provided ones.

Regards,
Mladen.

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

DO NOT REPLY [Bug 41939] - NPE in Logging due to classloading

[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=41939


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|INVALID |




--- Additional Comments From [EMAIL PROTECTED]  2007-03-26 03:42 ---
Then: Why does the very same package deploy on 5.5.9?

And: Yes there are duplicate classes in the packages, but in the end you will
never be able to avoid it. 

And: There is the, mabe even written law, that it is definitely good practice
that one should package all required classes inside the web-app\lib path,
besides native lib adapters. If this is suddenly not true any more, then how do
you deploy different independent applications with incompatible commons-logging
implementations? 

The answer may be easy for you, but I think that I have done valid packaging and
that the classloader is in fact mixing packages from /common/lib with packages
from my application web-inf/lib on application reload.

It looks like it is preferring the common/lib instance of the jar on reloading,
not recognizing, that there is a jar in WEB-IN/lib carrying the same class.
Following the rules of classloading, the Web-App's jar should be used. 

But you are free to correct me if I am wrong.

-- 
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]

DO NOT REPLY [Bug 41070] - Autodeployer takes war file while it is not yet fully written

[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=41070


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||WONTFIX




--- Additional Comments From [EMAIL PROTECTED]  2007-03-26 04:00 ---
Please understand that WONTFIX means WONTFIX.  The ONLY impact of leaving a
WONTFIX bug open is a delay in fixing other bugs.

-- 
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]

[PATCH] - Remove redundant code in Mapper.java

[Arvind Srinivasan]

Attached is a simple patch (for TC 6.0's trunk) that removes a couple of 
lines of redundant code in org.apache.tomcat.util.http.mapper.Mapper


Arvind
Index: java/org/apache/tomcat/util/http/mapper/Mapper.java
===
--- java/org/apache/tomcat/util/http/mapper/Mapper.java	(revision 522491)
+++ java/org/apache/tomcat/util/http/mapper/Mapper.java	(working copy)
@@ -744,12 +744,6 @@
 && context.defaultWrapper != null) {
 mappingData.wrapper =
 context.defaultWrapper.object;
-mappingData.requestPath.setChars
-(path.getBuffer(), path.getStart(), 
- path.getLength());
-mappingData.wrapperPath.setChars
-(path.getBuffer(), path.getStart(), 
- path.getLength());
 mappingData.requestPath.setString(pathStr);
 mappingData.wrapperPath.setString(pathStr);
 }

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

DO NOT REPLY [Bug 41766] - apache-tomcat-5.5.20-src.tar.gz includes broken class files

[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=41766





--- Additional Comments From [EMAIL PROTECTED]  2007-03-26 05:30 ---
(In reply to comment #3)
> And 6.0.10, for that matter?

(In reply to comment #2)
> Andrew, is the behavior the same for 5.5.23?

Exactly the same behaviour in 5.5.23, for example:

/tmp/apache-tomcat-5.5.23-src/connectors/jk/jkstatus/build/classes/org/apache/jk/status$
/usr/java/jdk1.5/bin/javap JkStatus
java.lang.ClassFormatError: invalid constant type: 97
at sun.tools.javap.ClassData.readCP(ClassData.java:180)
at sun.tools.javap.ClassData.read(ClassData.java:81)
at sun.tools.javap.ClassData.(ClassData.java:52)
at sun.tools.javap.JavapPrinter.(JavapPrinter.java:28)
at sun.tools.javap.Main.displayResults(Main.java:201)
at sun.tools.javap.Main.perform(Main.java:61)
at sun.tools.javap.Main.entry(Main.java:49)
at sun.tools.javap.Main.main(Main.java:34)
ERROR:fatal error
Exception in thread "main" java.lang.NullPointerException
at sun.tools.javap.JavapPrinter.javaclassname(JavapPrinter.java:791)
at sun.tools.javap.JavapPrinter.printclassHeader(JavapPrinter.java:60)
at sun.tools.javap.JavapPrinter.print(JavapPrinter.java:36)
at sun.tools.javap.Main.displayResults(Main.java:202)
at sun.tools.javap.Main.perform(Main.java:61)
at sun.tools.javap.Main.entry(Main.java:49)
at sun.tools.javap.Main.main(Main.java:34) 



Problem isn't present in 6.0.10, simply because there are no class files in the
tarball.

-- 
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]

Re: [PATCH] - Remove redundant code in Mapper.java

[Remy Maucherat]

Arvind Srinivasan wrote:
Attached is a simple patch (for TC 6.0's trunk) that removes a couple of 
lines of redundant code in org.apache.tomcat.util.http.mapper.Mapper


I am not certain they're that redundant. I would leave them in just to 
be safe given that the cost of these calls is very low.


Rémy

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

DO NOT REPLY [Bug 41939] - NPE in Logging due to classloading

[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=41939





--- Additional Comments From [EMAIL PROTECTED]  2007-03-26 06:38 ---
This bug should not be dismissed. My own web application includes one instance
each of commons-logging-1.1.jar and log4j-1.2.14.jar. My
$CATALINA_HOME/common/lib does not contain a commons-logging jar (unless the
class files are embedded in one of the other jars???).

Additionally, the NPE is thrown by log4j code. In fact, I have done some
debugging on the log4j code-base, and the behavior that I witnessed defied
standard java convention. That is, the NPE is caused by certain static class
fields (whose values are set at instantiation) arbitrarily becoming null when
one attempts to reload the context that contains the log4j jar. In effect,
certain static members of the log4j classes are not being re-initialized when
the context is reloaded.

For my part, I have worked around the issue by patching my log4j to
re-initialize the problem fields itself when they are detected to be null, but
in all honesty, this hack should be unnecessary.

Now, I would not say that this bug is a number one priority show-stopper (or
even that it should be fixed), but it should, at least, be acknowledged.

-- 
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]

DO NOT REPLY [Bug 39740] - semi-colon ; isn't allowed as a query argument separator

[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=39740





--- Additional Comments From [EMAIL PROTECTED]  2007-03-26 10:03 ---
Ideally in the next revision of RFC 2616 this "recommendation to HTTP server
implementors" would be implemented in the spec.  W3C doesn't write the HTTP
protocol spec, the IETF publishes it.




-- 
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]

DO NOT REPLY [Bug 40593] - HttpSessionListener#sessionDestroyed is not called though the manager's pathname is emply.

[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=40593





--- Additional Comments From [EMAIL PROTECTED]  2007-03-26 10:42 ---
I have seen that tomcat 6 the listenerStop() calls after manager.stop().
I vote to change it also at tomcat 5.5 codebase.

Peter

(In reply to comment #5)
> Either Mark or Suzuki: did you ever develop a patch for this?  If so, please
> attach it to this item (or in Mark's case, just commit it).  I'll be glad to
> review it.

-- 
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: r522580 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java

[remm]

Author: remm
Date: Mon Mar 26 10:52:23 2007
New Revision: 522580

URL: http://svn.apache.org/viewvc?view=rev&rev=522580
Log:
- CRLF inside a URL pattern is always invalid, AFAIK.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?view=diff&rev=522580&r1=522579&r2=522580
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Mon 
Mar 26 10:52:23 2007
@@ -5057,7 +5057,7 @@
 if (urlPattern == null)
 return (false);
 if (urlPattern.indexOf('\n') >= 0 || urlPattern.indexOf('\r') >= 0) {
-
getLogger().warn(sm.getString("standardContext.crlfinurl",urlPattern));
+return (false);
 }
 if (urlPattern.startsWith("*.")) {
 if (urlPattern.indexOf('/') < 0)



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

DO NOT REPLY [Bug 41949] New: - mod_jk 1.2.21 POST JSP Page SSI JSP sub request does not complete

[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=41949

   Summary: mod_jk 1.2.21 POST JSP Page SSI JSP sub request does not
complete
   Product: Tomcat 4
   Version: 4.1.31
  Platform: PC
OS/Version: FreeBSD
Status: NEW
  Severity: normal
  Priority: P2
 Component: Connector:JK/AJP
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


FreeBSD 6.0-RELEASE-p4
apache-2.0.59
mod_jk 1.2.21
Tomcat 4.1.30

When apache is configured with an output filter to post process HTML generated
by a JSP page for SSI and the generated html has an SSI include virtual of
another JSP page and the original request was a POST mod_jk will hang while
sending the POST headers during the sub request.

To reproduce add the following to the VirtualHost section to enable post
processing of HTML generated from a JSP page for SSI:


Options Includes
AddOutputFilterByType INCLUDES text/html


Create a simple test.html page which does a POST:


mod_jk JSP Post Test





Create a test1.jsp page as follows:

<%@ page session="false" %>

This is test1.jsp





Finally here is the test2.jsp page:

<%@ page session="false" %>

This is test2.jsp


All of the above works fine if test.html uses a GET but mod_jk hangs
if test.html uses a POST. This problem doesn't exist in mod_jk 1.2.19.

-- 
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]

Re: Annotation processing - Geronimo injection

[David Blevins]

On Mar 24, 2007, at 10:42 PM, David Jencks wrote:



On Mar 24, 2007, at 6:18 PM, Bill Barker wrote:



"Filip Hanik - Dev Lists" <[EMAIL PROTECTED]> wrote in message
news:[EMAIL PROTECTED]

yo,
I've been in touch with the folks at Geronimo.
They use dependency injection, and have a suggestion on how they  
would

like the annotation processor to be able to be injected into tomcat

Here is the email
http://marc.info/?l=geronimo-dev&m=117467149802844&w=2

Here is the proposed patch:
https://issues.apache.org/jira/secure/attachment/12354097/ 
GERONIMO-3010-1.patch




A big huge -1 to the patch.  It doesn't really provide anything to  
Tomcat
that it isn't doing already.  And to the extent that it is doing  
things
differently, it is only adding complexity resulting in doing a  
much worse

job.



You might consider the idea of an object creation and destruction  
service rather than the current state of the patch which was not  
really intended for presentation as something to be applied as is  
to tomcat but as a demonstration that tomcat could be made to work  
with such a service.  I figured that the first step was to  
investigate whether this was practical with minimal code changes in  
tomcat, and then think about how to further clean up the tomcat  
code.  I've demonstrated to my own satisfaction that the idea can  
work, but the code could be simplified a lot.  In its current state  
there is essentially no code that isn't already present in tomcat,  
although it's arranged slightly differently and is considerably  
more uniform.


However, introducing a catalina dependancy into Jasper is a really  
huge
no-no.  Jasper is useful, and used without Tomcat.  To break this  
would
require a very good reason, which this patch certainly doesn't  
provide.


How does this differ from the current  
org.apache.AnnotationProcessor?  The only difference I can see is  
that I used the project namespace.  I can't say I understand the  
thinking behind the package for org.apache.AnnotationProcessor.




I'd take out the word LifecycleProvider, and replace it with  
something

else as it conflicts with our own idea of Lifecycle.


Ya, I don't much like the name either but those postConstruct and  
preDestroy methods are often called lifecycle methods. I had to  
call it something.  Any better ideas?  ManagedObjectFactory?


I might suggest something like InstanceManager.  IIUC, you'd have  
these two methods on it:


  createInstance(..)
  destroyInstance(..)

Assuming I understand the proposal, the default Tomcat implementation  
would call through to the AnnotationProcessor and all would stay the  
same in that regard.  Above that though, I could easily imagine  
someone using that interface in Tomcat to provide an implementation  
that did instance counting for the Tomcat management console and  
maybe even sending out JMX notifications on create/destroy.


I'm not sure I understand the bits about dependencies between Jasper  
and Catalina.  I grok that Jasper is not to be dependent on Catalina,  
but I wonder if there are any shared libraries between the two that  
might be a good home for the proposed interface.  Are there any  
shared "Tomcat project" libs between Jasper and Catalina or does  
Jasper pretty much only use third-party libs (libs outside the tomcat  
project itself)?


-David



I'd like to get your feedback, this is a chance step for our two
communities to work together.


There's certainly interest on the geronimo side.

Many thanks
david jencks



Filip





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




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




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

DO NOT REPLY [Bug 41853] - Servlet init method invoked twice in 5.5.20

[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=41853





--- Additional Comments From [EMAIL PROTECTED]  2007-03-26 14:36 ---
A ServletContextListener is also created and initialized twice.

This configuration in web.xml

  
org.ntropa.adapter.servlet.NtropaBuilder
  

results in two log entries instead of one.

INFO: NtropaBuilder: init: id: 15277917 initCount: 1, static: 1, Runtime id: 
17447716
INFO: NtropaBuilder: init: id: 12710158 initCount: 1, static: 1, Runtime id: 
17447716

This is the code that outputs the above logs entries,

private int initCount;

private static int staticInitCount;

public void contextInitialized(ServletContextEvent sce) {

initCount++;
staticInitCount++;
context.log("NtropaBuilder: init: id: " + System.identityHashCode(this) 
+ " initCount: " + initCount
+ ", static: " + staticInitCount + ", Runtime id: " + 
System.identityHashCode(Runtime.getRuntime()));

   ...}

-- 
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: r522651 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java

[fhanik]

Author: fhanik
Date: Mon Mar 26 15:24:32 2007
New Revision: 522651

URL: http://svn.apache.org/viewvc?view=rev&rev=522651
Log:
never return null
 

Modified:

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java?view=diff&rev=522651&r1=522650&r2=522651
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
 (original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
 Mon Mar 26 15:24:32 2007
@@ -411,8 +411,9 @@
 /**
  * Return all the members
  */
+protected static final Member[]EMPTY_MEMBERS = new Member[0];
 public Member[] getMembers() {
-if ( impl == null || impl.membership == null ) return null;
+if ( impl == null || impl.membership == null ) return EMPTY_MEMBERS;
 return impl.membership.getMembers();
 }
 /**



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

Re: [PATCH] - Remove redundant code in Mapper.java

[Sven Köhler]

>> Attached is a simple patch (for TC 6.0's trunk) that removes a couple
>> of lines of redundant code in org.apache.tomcat.util.http.mapper.Mapper
> 
> I am not certain they're that redundant. I would leave them in just to
> be safe given that the cost of these calls is very low.

They are not redundant.

Arvind, take a look at the class org.apache.tomcat.util.buf.MessageBytes:
setString(String) does influence the members byteC or charC.

The MessageBytes-class can store 3 different values at once: byte[],
char[], String. These 3 values are not automatically synchronized.
Actually byteC can contain "foo", charC can contain "bar" and strValue
can contain "bla" at the same time.




signature.asc
Description: OpenPGP digital signature

DO NOT REPLY [Bug 41939] - NPE in Logging due to classloading

[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=41939





--- Additional Comments From [EMAIL PROTECTED]  2007-03-26 17:12 ---
You do remember that when you undeploy an application (while restarting it), the
tomcat classloader reflects on all the classes it's unloading, and resets any
static members to null.

Depending on the order in which it does this, if there are some other threads
still running, they can get NPEs..

-- 
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]

DO NOT REPLY [Bug 38713] - java.io.IOException: tmpFile.renameTo(classFile) failed when compiling new JSP (upon redeploy)

[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=38713





--- Additional Comments From [EMAIL PROTECTED]  2007-03-26 17:58 ---
Hi all - in XP the reason this was happening for us was because the overall file
path of the file with an extension of .classtmp was > 256 characters long and
the rename would not work. We had the problem in tomcat within jboss, so
renaming the location of the jboss server to give us a filepath of <256 fixed
the problem.



-- 
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]

DO NOT REPLY [Bug 41093] - publish 6.0.2 beta jars in a maven repository

[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=41093


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2007-03-26 20:42 ---
We are currently publishing to our tomcat repo
http://tomcat.apache.org/dev/dist/m2-repository/

Doesn't seem like I can publish to the central repo because it requires PGP
signatures and maven doesn't let you do that with single JAR if you're not
building with Maven.

If you have a way to get the PGP info in there in the way we are doing it now,
let us know and open a new bug.

-- 
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]

DO NOT REPLY [Bug 41128] - Reference to java Thread name from RequestProcessor mbean

[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=41128


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |NEEDINFO




--- Additional Comments From [EMAIL PROTECTED]  2007-03-26 20:44 ---
Do you want to submit a patch?

-- 
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: r522745 - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina: core/ApplicationContext.java ha/context/ReplicatedContext.java tribes/tipis/AbstractReplicatedMap.java

[fhanik]

Author: fhanik
Date: Mon Mar 26 21:44:06 2007
New Revision: 522745

URL: http://svn.apache.org/viewvc?view=rev&rev=522745
Log:
fixes for
http://issues.apache.org/bugzilla/show_bug.cgi?id=41166
although there is still work to be done, need to separate Tomcat attributes vs. 
application attributes

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java?view=diff&rev=522745&r1=522744&r2=522745
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java 
Mon Mar 26 21:44:06 2007
@@ -804,12 +804,17 @@
 
 
 //  Package Methods
-
-
+protected StandardContext getContext() {
+return this.context;
+}
+
+protected Map getReadonlyAttributes() {
+return this.readOnlyAttributes;
+}
 /**
  * Clear all application-created attributes.
  */
-void clearAttributes() {
+protected void clearAttributes() {
 
 // Create list of attributes to be removed
 ArrayList list = new ArrayList();

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java?view=diff&rev=522745&r1=522744&r2=522745
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java 
Mon Mar 26 21:44:06 2007
@@ -26,6 +26,11 @@
 import org.apache.catalina.Globals;
 import javax.servlet.ServletContext;
 import java.util.AbstractMap;
+import org.apache.catalina.tribes.tipis.AbstractReplicatedMap;
+import java.util.ArrayList;
+import java.util.Iterator;
+import javax.servlet.ServletContextAttributeListener;
+import javax.servlet.ServletContextAttributeEvent;
 
 /**
  * @author Filip Hanik
@@ -98,6 +103,12 @@
 }
 
 public ServletContext getServletContext() {
+if (context == null) {
+context = new ReplApplContext(getBasePath(), this);
+if (getAltDDName() != null)
+context.setAttribute(Globals.ALT_DD_ATTR,getAltDDName());
+}
+
 return ((ReplApplContext)context).getFacade();
 
 }
@@ -118,8 +129,19 @@
 public void setAttributeMap(AbstractMap map) {
 this.attributes = map;
 }
-
+
+public void removeAttribute(String name) {
+//do nothing
+super.removeAttribute(name);
+}
+
+public void setAttribute(String name, Object value) {
+//do nothing
+super.setAttribute(name,value);
+}
+
 }
+
 
 
 }

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?view=diff&rev=522745&r1=522744&r2=522745
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
 (original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
 Mon Mar 26 21:44:06 2007
@@ -747,10 +747,13 @@
  * @return Object
  */
 public Object remove(Object key) {
+return remove(key,true);
+}
+public Object remove(Object key, boolean notify) {
 MapEntry entry = (MapEntry)super.remove(key);
 
 try {
-if (getMapMembers().length > 0 ) {
+if (getMapMembers().length > 0 && notify) {
 MapMessage msg = new MapMessage(getMapContextName(), 
MapMessage.MSG_REMOVE, false, (Serializable) key, null, null, null);
 getChannel().send(getMapMembers(), msg, 
getChannelSendOptions());
 }
@@ -885,11 +888,20 @@
 put(entry.getKey(),entry.getValue());
 }
 }
-
+
 public void clear() {
-//only delete active keys
-Iterator keys = keySet().iterator();
-while ( keys.hasNext() ) remove(keys.next());
+clear(true);
+}
+
+public void clear(boolean notify) {
+if ( notify ) {
+//only delete active keys
+Iterator keys 

DO NOT REPLY [Bug 41949] - mod_jk 1.2.21 POST JSP Page SSI JSP sub request does not complete

[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=41949


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WORKSFORME




--- Additional Comments From [EMAIL PROTECTED]  2007-03-26 22:11 ---
Didn't check with 1.2.21, but it works with HEAD (mod_jk 1.2.22)

-- 
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: r522764 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c common/jk_logger.h common/jk_util.c

[mturk]

Author: mturk
Date: Mon Mar 26 22:36:13 2007
New Revision: 522764

URL: http://svn.apache.org/viewvc?view=rev&rev=522764
Log:
JK name prefix file_logger_t structure, No functional changes

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/native/common/jk_logger.h
tomcat/connectors/trunk/jk/native/common/jk_util.c

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?view=diff&rev=522764&r1=522763&r2=522764
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Mon Mar 26 22:36:13 
2007
@@ -2366,7 +2366,7 @@
 if (l &&
 (l->level <= level || level == JK_LOG_REQUEST_LEVEL) &&
  l->logger_private && what) {
-file_logger_t *flp = l->logger_private;
+jk_file_logger_t *flp = l->logger_private;
 int log_fd = flp->log_fd;
 size_t sz = strlen(what);
 if (log_fd >= 0 && sz) {
@@ -2405,7 +2405,7 @@
 int jklogfd;
 piped_log *pl;
 jk_logger_t *jkl;
-file_logger_t *flp;
+jk_file_logger_t *flp;
 jk_server_conf_t *conf =
 (jk_server_conf_t *) ap_get_module_config(s->module_config,
   &jk_module);
@@ -2469,7 +2469,7 @@
 }
 conf->log_fd = jklogfd;
 jkl = (jk_logger_t *)ap_palloc(p, sizeof(jk_logger_t));
-flp = (file_logger_t *)ap_palloc(p, sizeof(file_logger_t));
+flp = (jk_file_logger_t *)ap_palloc(p, sizeof(jk_file_logger_t));
 if (jkl && flp) {
 jkl->log = jk_log_to_file;
 jkl->level = conf->log_level;

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=522764&r1=522763&r2=522764
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Mon Mar 26 22:36:13 
2007
@@ -2500,7 +2500,7 @@
 char error[256];
 if (sz) {
 apr_status_t status;
-file_logger_t *p = l->logger_private;
+jk_file_logger_t *p = l->logger_private;
 if (p->jklogfp) {
 apr_status_t rv;
 rv = apr_global_mutex_lock(jk_log_lock);
@@ -2554,7 +2554,7 @@
 apr_file_t *jklogfp;
 piped_log *pl;
 jk_logger_t *jkl;
-file_logger_t *flp;
+jk_file_logger_t *flp;
 int jklog_flags = (APR_WRITE | APR_APPEND | APR_CREATE);
 apr_fileperms_t jklog_mode =
 (APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD);
@@ -2606,7 +2606,7 @@
 }
 conf->jklogfp = jklogfp;
 jkl = (jk_logger_t *)apr_palloc(p, sizeof(jk_logger_t));
-flp = (file_logger_t *) apr_palloc(p, sizeof(file_logger_t));
+flp = (jk_file_logger_t *) apr_palloc(p, sizeof(jk_file_logger_t));
 if (jkl && flp) {
 jkl->log = jk_log_to_file;
 jkl->level = conf->log_level;

Modified: tomcat/connectors/trunk/jk/native/common/jk_logger.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_logger.h?view=diff&rev=522764&r1=522763&r2=522764
==
--- tomcat/connectors/trunk/jk/native/common/jk_logger.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_logger.h Mon Mar 26 22:36:13 
2007
@@ -42,8 +42,8 @@
 
 };
 
-typedef struct file_logger_t file_logger_t;
-struct file_logger_t
+typedef struct jk_file_logger_t jk_file_logger_t;
+struct jk_file_logger_t
 {
 FILE *logfile;
 /* For Apache 2 APR piped logging */

Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.c?view=diff&rev=522764&r1=522763&r2=522764
==
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Mon Mar 26 22:36:13 2007
@@ -397,7 +397,7 @@
 if (l &&
 (l->level <= level || level == JK_LOG_REQUEST_LEVEL) &&
 l->logger_private && what) {
-file_logger_t *p = l->logger_private;
+jk_file_logger_t *p = l->logger_private;
 if (p->logfile) {
 fputs(what, p->logfile);
 /* [V] Flush the dam' thing! */
@@ -442,7 +442,7 @@
 if (l && file) {
 
 jk_logger_t *rc = (jk_logger_t *)malloc(sizeof(jk_logger_t));
-file_logger_t *p = (file_logger_t *) malloc(sizeof(file_logger_t));
+jk_file_logger_t *p = (jk_file_logger_t *) 
malloc(sizeof(jk_file_logger_t));
 if (rc && p) {
 rc-

DO NOT REPLY [Bug 41797] - CNFE/NPE thrown from function mapper when externalizing

[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=41797


[EMAIL PROTECTED] changed:

   What|Removed |Added

Summary|CNFE thrown from function   |CNFE/NPE thrown from
   |mapper when remapping   |function mapper when
   |reference back to instance  |externalizing




--- Additional Comments From [EMAIL PROTECTED]  2007-03-26 23:06 ---
NPE is thrown from function mapper when externalizing second time. First time
loses reference to originating method and second time ignores the fact that
method may indeed still be null.

Patch is to prefer non-transient fields filled during externalization over
method itself.

Caused by: java.lang.NullPointerException
 at
org.apache.el.lang.FunctionMapperImpl$Function.writeExternal(FunctionMapperImpl.java:123)
 at java.io.ObjectOutputStream.writeExternalData(ObjectOutputStream.java:1421)
 at java.io.ObjectOutputStream.writeOrdinaryObject(ObjectOutputStream.java:1390)
 at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1150)
 at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:326)
 at java.util.HashMap.writeObject(HashMap.java:1000)
 at sun.reflect.GeneratedMethodAccessor58.invoke(Unknown Source)
 at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
 at java.lang.reflect.Method.invoke(Method.java:597)
 at java.io.ObjectStreamClass.invokeWriteObject(ObjectStreamClass.java:945)
 at java.io.ObjectOutputStream.writeSerialData(ObjectOutputStream.java:1461)
 at java.io.ObjectOutputStream.writeOrdinaryObject(ObjectOutputStream.java:1392)
 at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1150)
 at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:326)
 at 
org.apache.el.lang.FunctionMapperImpl.writeExternal(FunctionMapperImpl.java:74)
 at java.io.ObjectOutputStream.writeExternalData(ObjectOutputStream.java:1421)
 at java.io.ObjectOutputStream.writeOrdinaryObject(ObjectOutputStream.java:1390)
 at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1150)
 at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:326)
 at 
org.apache.el.ValueExpressionImpl.writeExternal(ValueExpressionImpl.java:256)
 at java.io.ObjectOutputStream.writeExternalData(ObjectOutputStream.java:1421)
 at java.io.ObjectOutputStream.writeOrdinaryObject(ObjectOutputStream.java:1390)
 at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1150)
 at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:326)
 at
com.sun.facelets.el.TagValueExpression.writeExternal(TagValueExpression.java:128)

-- 
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]

DO NOT REPLY [Bug 41797] - CNFE/NPE thrown from function mapper when externalizing

[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=41797





--- Additional Comments From [EMAIL PROTECTED]  2007-03-26 23:09 ---
(From update of attachment 19687)
Index:
C:/cygwin/home/kivtuo/scm/tomcat/tc6.0.x/jasper/src/share/org/apache/el/lang/Fu
nctionMapperImpl.java
===
---
C:/cygwin/home/kivtuo/scm/tomcat/tc6.0.x/jasper/src/share/org/apache/el/lang/Fu
nctionMapperImpl.java(revision 416976)
+++
C:/cygwin/home/kivtuo/scm/tomcat/tc6.0.x/jasper/src/share/org/apache/el/lang/Fu
nctionMapperImpl.java(working copy)
@@ -119,9 +119,9 @@
 public void writeExternal(ObjectOutput out) throws IOException {
 out.writeUTF((this.prefix != null) ? this.prefix : "");
 out.writeUTF(this.localName);
-out.writeUTF(this.m.getDeclaringClass().getName());
-out.writeUTF(this.m.getName());
-   
out.writeObject(ReflectionUtil.toTypeNameArray(this.m.getParameterTypes()));
+out.writeUTF((this.owner != null) ? this.owner :
this.m.getDeclaringClass().getName());
+out.writeUTF((this.name != null) ? this.name : this.m.getName());
+out.writeObject((this.types != null) ? this.types :
ReflectionUtil.toTypeNameArray(this.m.getParameterTypes()));
 }

 /*
@@ -143,7 +143,7 @@
 public Method getMethod() {
 if (this.m == null) {
 try {
-Class t = Class.forName(this.owner);
+Class t = ReflectionUtil.forName(this.owner);
 Class[] p = ReflectionUtil.toTypeArray(this.types);
 this.m = t.getMethod(this.name, p);
 } catch (Exception e) {


-- 
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]

DO NOT REPLY [Bug 41797] - CNFE/NPE thrown from function mapper when externalizing

[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=41797


[EMAIL PROTECTED] changed:

   What|Removed |Added

Version|6.0.2   |6.0.10




-- 
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]

DO NOT REPLY [Bug 41166] - Unable to start ReplicatedContext

[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=41166


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2007-03-26 23:34 ---
Thanks for the report

-- 
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: r522773 - in /tomcat/tc6.0.x/trunk: java/org/apache/catalina/ha/context/ java/org/apache/catalina/tribes/tipis/ webapps/docs/

[fhanik]

Author: fhanik
Date: Mon Mar 26 23:45:41 2007
New Revision: 522773

URL: http://svn.apache.org/viewvc?view=rev&rev=522773
Log: (empty)

Modified:

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java?view=diff&rev=522773&r1=522772&r2=522773
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java 
Mon Mar 26 23:45:41 2007
@@ -31,21 +31,30 @@
 import java.util.Iterator;
 import javax.servlet.ServletContextAttributeListener;
 import javax.servlet.ServletContextAttributeEvent;
+import org.apache.catalina.LifecycleEvent;
+import org.apache.catalina.LifecycleListener;
+import java.util.Enumeration;
+import java.util.concurrent.ConcurrentHashMap;
+import org.apache.catalina.util.Enumerator;
 
 /**
  * @author Filip Hanik
  * @version 1.0
  */
-public class ReplicatedContext extends StandardContext {
+public class ReplicatedContext extends StandardContext implements 
LifecycleListener {
 private int mapSendOptions = Channel.SEND_OPTIONS_DEFAULT;
 public static org.apache.juli.logging.Log log = 
org.apache.juli.logging.LogFactory.getLog( ReplicatedContext.class );
-
+protected boolean startComplete = false;
 protected static long DEFAULT_REPL_TIMEOUT = 15000;//15 seconds
 
-
+public void lifecycleEvent(LifecycleEvent event) {
+if ( event.getType() == AFTER_START_EVENT ) 
+startComplete = true;
+}
 
 public synchronized void start() throws LifecycleException {
 if ( this.started ) return;
+super.addLifecycleListener(this);
 try {
 CatalinaCluster catclust = (CatalinaCluster)this.getCluster();
 if (this.context == null) this.context = new 
ReplApplContext(this.getBasePath(), this);
@@ -71,12 +80,15 @@
 }
 if ( !this.started ) return;
 try {
+super.lifecycle.removeLifecycleListener(this);
 } catch ( Exception x ){
 log.error("Unable to stop ReplicatedContext",x);
 throw new LifecycleException("Failed to stop ReplicatedContext",x);
 } finally {
+this.startComplete = false;
 super.stop();
 }
+
 
 }
 
@@ -115,11 +127,17 @@
 
 
 protected static class ReplApplContext extends ApplicationContext {
-public ReplApplContext(String basePath, StandardContext context) {
+protected ConcurrentHashMap tomcatAttributes = new ConcurrentHashMap();
+
+public ReplApplContext(String basePath, ReplicatedContext context) {
 super(basePath,context);
 }
 
- protected ServletContext getFacade() {
+protected ReplicatedContext getParent() {
+return (ReplicatedContext)getContext();
+}
+
+protected ServletContext getFacade() {
  return super.getFacade();
 }
 
@@ -131,17 +149,49 @@
 }
 
 public void removeAttribute(String name) {
+tomcatAttributes.remove(name);
 //do nothing
 super.removeAttribute(name);
 }
 
 public void setAttribute(String name, Object value) {
-//do nothing
-super.setAttribute(name,value);
+if ( (!getParent().startComplete) || 
"org.apache.jasper.runtime.JspApplicationContextImpl".equals(name) ){
+tomcatAttributes.put(name,value);
+} else
+super.setAttribute(name,value);
+}
+
+public Object getAttribute(String name) {
+if (tomcatAttributes.containsKey(name) )
+return tomcatAttributes.get(name);
+else 
+return super.getAttribute(name);
+}
+
+public Enumeration getAttributeNames() {
+return new MultiEnumeration(new Enumeration[] 
{super.getAttributeNames(),new Enumerator(tomcatAttributes.keySet(), true)});
 }
 
 }
 
+protected static class MultiEnumeration implements Enumeration {
+Enumeration[] e=null;
+public MultiEnumeration(Enumeration[] lists) {
+e = lists;
+}
+public boolean hasMoreElements() {
+for ( int i=0; ihttp://svn.apache.org/viewvc/tomcat/tc6.0.x/tru

svn commit: r522774 - in /tomcat/tc6.0.x/trunk: java/org/apache/tomcat/util/net/JIoEndpoint.java java/org/apache/tomcat/util/net/NioEndpoint.java webapps/docs/changelog.xml

[fhanik]

Author: fhanik
Date: Mon Mar 26 23:48:01 2007
New Revision: 522774

URL: http://svn.apache.org/viewvc?view=rev&rev=522774
Log:
don't log io exception if the connector is not running

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java?view=diff&rev=522774&r1=522773&r2=522774
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Mon 
Mar 26 23:48:01 2007
@@ -318,6 +318,8 @@
 // Ignore
 }
 }
+}catch ( IOException x ) {
+if ( running ) 
log.error(sm.getString("endpoint.accept.fail"), x);
 } catch (Throwable t) {
 log.error(sm.getString("endpoint.accept.fail"), t);
 }

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?view=diff&rev=522774&r1=522773&r2=522774
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Mon 
Mar 26 23:48:01 2007
@@ -1192,6 +1192,8 @@
 }
 } 
 }
+}catch ( IOException x ) {
+if ( running ) 
log.error(sm.getString("endpoint.accept.fail"), x);
 } catch (OutOfMemoryError oom) {
 try {
 oomParachuteData = null;
@@ -2126,6 +2128,7 @@
 }
 
 }
+
 // -- TaskQueue Inner Class
 public static class TaskQueue extends LinkedBlockingQueue {
 ThreadPoolExecutor parent = null;

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=522774&r1=522773&r2=522774
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Mar 26 23:48:01 2007
@@ -18,6 +18,9 @@
   
 
   
+41530  Don't log error messages when connector is stopped 
(fhanik)
+  
+  
 41166 Invalid handling when using replicated context 
(fhanik)
   
   



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

DO NOT REPLY [Bug 41577] - images under ssl fail to load

[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=41577


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution||WORKSFORME




--- Additional Comments From [EMAIL PROTECTED]  2007-03-26 23:49 ---
I'd assume there is no longer a problem, I was unable to reproduce it

-- 
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: r522786 - in /tomcat/tc6.0.x/trunk: java/org/apache/catalina/ha/session/DeltaSession.java webapps/docs/changelog.xml

[fhanik]

Author: fhanik
Date: Mon Mar 26 23:52:10 2007
New Revision: 522786

URL: http://svn.apache.org/viewvc?view=rev&rev=522786
Log:
fix 41682  

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?view=diff&rev=522786&r1=522785&r2=522786
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java 
Mon Mar 26 23:52:10 2007
@@ -359,7 +359,7 @@
 if (notifyCluster) {
 if (log.isDebugEnabled())
 log.debug(sm.getString("deltaSession.notifying",
-   ((DeltaManager)manager).getName(), 
+   ((ClusterManager)manager).getName(), 
new Boolean(isPrimarySession()), 
expiredId));
 if ( manager instanceof DeltaManager ) {

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=522786&r1=522785&r2=522786
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Mar 26 23:52:10 2007
@@ -18,6 +18,9 @@
   
 
   
+41682 ClassCastException when logging is turned on (fhanik)
+  
+  
 41530  Don't log error messages when connector is stopped 
(fhanik)
   
   



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

DO NOT REPLY [Bug 41682] - ClassCastException with BackupManager + debug logging

[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=41682


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2007-03-26 23:52 ---
Thanks for the report

-- 
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]

DO NOT REPLY [Bug 41745] - recommended or forbidden?

[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=41745


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID




--- Additional Comments From [EMAIL PROTECTED]  2007-03-26 23:56 ---
Seems pretty clear to me,
if you have a shared hosting environment, don't allow users to deploy a
context.xml file in the webapp's META-INF directory.


-- 
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: r522792 - in /tomcat/tc6.0.x/trunk: java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java webapps/docs/changelog.xml

[fhanik]

Author: fhanik
Date: Mon Mar 26 23:58:27 2007
New Revision: 522792

URL: http://svn.apache.org/viewvc?view=rev&rev=522792
Log:
Fixed 41703

Modified:

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java?view=diff&rev=522792&r1=522791&r2=522792
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java
 (original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java
 Mon Mar 26 23:58:27 2007
@@ -71,7 +71,7 @@
  * @param member Member
  */
 public void setAddress(Member member) {
-   this.address = address;
+   this.address = member;
 }
 
 /**

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=522792&r1=522791&r2=522792
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Mar 26 23:58:27 2007
@@ -18,6 +18,9 @@
   
 
   
+41703 SingleSignOnMessage invalid setter, patch provided by 
Nils Hammar (fhanik)
+  
+  
 41682 ClassCastException when logging is turned on (fhanik)
   
   



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

DO NOT REPLY [Bug 41703] - Variable assigned with it's own value.

[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=41703


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




-- 
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]

DO NOT REPLY [Bug 41463] - Exception report with IE but not firefox!

[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=41463


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |NEEDINFO




--- Additional Comments From [EMAIL PROTECTED]  2007-03-27 00:00 ---
Could you provide a better test case, ie, a war file or something that will
allow us to reproduce it easily?

thanks


-- 
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]

DO NOT REPLY [Bug 41864] - Wrong link on default home page

[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=41864


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WORKSFORME




--- Additional Comments From [EMAIL PROTECTED]  2007-03-27 00:02 ---
This works for me for the index.jsp page

-- 
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]

DO NOT REPLY [Bug 41530] - stopping a connector produces intermittent SocketException

[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=41530


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




-- 
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: r522797 - in /tomcat/tc6.0.x/trunk: bin/catalina.bat bin/catalina.sh webapps/docs/changelog.xml

[fhanik]

Author: fhanik
Date: Tue Mar 27 00:10:29 2007
New Revision: 522797

URL: http://svn.apache.org/viewvc?view=rev&rev=522797
Log:
fix 41786

Modified:
tomcat/tc6.0.x/trunk/bin/catalina.bat
tomcat/tc6.0.x/trunk/bin/catalina.sh
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/bin/catalina.bat
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.bat?view=diff&rev=522797&r1=522796&r2=522797
==
--- tomcat/tc6.0.x/trunk/bin/catalina.bat (original)
+++ tomcat/tc6.0.x/trunk/bin/catalina.bat Tue Mar 27 00:10:29 2007
@@ -94,7 +94,7 @@
 set CATALINA_TMPDIR=%CATALINA_BASE%\temp
 :gotTmpdir
 
-if not exist "%CATALINA_HOME%\conf\logging.properties" goto noJuli
+if not exist "%CATALINA_BASE%\conf\logging.properties" goto noJuli
 set JAVA_OPTS=%JAVA_OPTS% 
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager 
-Djava.util.logging.config.file="%CATALINA_BASE%\conf\logging.properties"
 :noJuli
 

Modified: tomcat/tc6.0.x/trunk/bin/catalina.sh
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.sh?view=diff&rev=522797&r1=522796&r2=522797
==
--- tomcat/tc6.0.x/trunk/bin/catalina.sh (original)
+++ tomcat/tc6.0.x/trunk/bin/catalina.sh Tue Mar 27 00:10:29 2007
@@ -162,7 +162,7 @@
 fi
 
 # Set juli LogManager if it is present
-if [ -r "$CATALINA_HOME"/conf/logging.properties ]; then
+if [ -r "$CATALINA_BASE"/conf/logging.properties ]; then
   JAVA_OPTS="$JAVA_OPTS 
"-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" 
"-Djava.util.logging.config.file="$CATALINA_BASE/conf/logging.properties"
 fi
 

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=522797&r1=522796&r2=522797
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Mar 27 00:10:29 2007
@@ -18,6 +18,9 @@
   
 
   
+41786   Incorrect reference to catalina_home in 
catalina.sh/bat Patch provided by Mike Hanafey (fhanik)
+  
+  
 41703 SingleSignOnMessage invalid setter, patch provided by 
Nils Hammar (fhanik)
   
   



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

6.0.11 anyone

[Filip Hanik - Dev Lists]

Any thoughts on a 6.0.11 release?

Filip


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

DO NOT REPLY [Bug 41786] - bin/catalina.sh inconsistently references CATALINA_HOME and CATALINA_BASE for logging configuration

[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=41786


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




-- 
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]

DO NOT REPLY [Bug 40593] - HttpSessionListener#sessionDestroyed is not called though the manager's pathname is emply.

[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=40593





--- Additional Comments From [EMAIL PROTECTED]  2007-03-27 00:29 ---
Created an attachment (id=19810)
 --> (http://issues.apache.org/bugzilla/attachment.cgi?id=19810&action=view)
tomcat5 patch for StandardContext calling listenerStop() after manager.stop()


-- 
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]

DO NOT REPLY [Bug 40593] - HttpSessionListener#sessionDestroyed is not called though the manager's pathname is emply.

[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=40593





--- Additional Comments From [EMAIL PROTECTED]  2007-03-27 00:31 ---
Thanks Peter.
I don't have good idea besides calling listenerStop() after manager.stop() 
same as Tomcat6.
It is so simple, but I attached the patch.

yuichiro


-- 
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]

DO NOT REPLY [Bug 39530] - Tomcat 5.5.17 generates incorrect code with trimSpaces turned on.

[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=39530





--- Additional Comments From [EMAIL PROTECTED]  2007-03-27 00:48 ---
Perhaps no-one's too worried about tuning the output of their JSP's so that
network traffic is reduced?  Ah...bandwidth

-- 
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]