cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler TagPluginManager.java

2003-01-01 Thread remm 
remm2003/01/01 04:25:58

  Modified:jasper2/src/share/org/apache/jasper/compiler
TagPluginManager.java
  Log:
  - To support nested tags, we should also visit child nodes.
  
  Revision  ChangesPath
  1.9   +13 -7 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagPluginManager.java
  
  Index: TagPluginManager.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagPluginManager.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- TagPluginManager.java 6 Dec 2002 23:19:58 -   1.8
  +++ TagPluginManager.java 1 Jan 2003 12:25:58 -   1.9
  @@ -97,11 +97,17 @@
return;
}
   
  - page.visit(new Node.Visitor() {
  -public void visit(Node.CustomTag n) {
  - invokePlugin(n);
  +page.visit(new Node.Visitor() {
  +public void visit(Node.CustomTag n)
  +throws JasperException {
  +invokePlugin(n);
  +Node.Nodes body = n.getBody();
  +if (body != null) {
  +body.visit(this);
  +}
   }
  - });
  +});
  +
   }

   private void init(ErrorDispatcher err) throws JasperException {
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net PoolTcpEndpoint.java

2003-01-01 Thread remm 
remm2003/01/01 05:55:22

  Modified:util/java/org/apache/tomcat/util/net PoolTcpEndpoint.java
  Log:
  - Don't check for null on the connection (it should never be null, and should be
caught by the throwable and logged if it happens).
  - Fix a problem when using SSL: when an exception occurs during the handshake,
if continue is used, the thread will immediately start to listen on the socket,
for no good reason. I found that patch on tomcat-user, alledgedly submitted
by Xiaojian Wang (I couldn't find the original message), and reposted
by Carl Zetterberg.
  
  Revision  ChangesPath
  1.11  +5 -7  
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java
  
  Index: PoolTcpEndpoint.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- PoolTcpEndpoint.java  19 Dec 2002 15:55:45 -  1.10
  +++ PoolTcpEndpoint.java  1 Jan 2003 13:55:22 -   1.11
  @@ -519,12 +519,12 @@
   endpoint.getServerSocketFactory().handshake(s);
}
   } catch (Throwable t) {
  -endpoint.log.info("Handshake failed", t);
  +endpoint.log.debug("Handshake failed", t);
   // Try to close the socket
   try {
   s.close();
   } catch (IOException e) {}
  -continue;
  +break;
   }
   
   TcpConnection con = null;
  @@ -536,8 +536,6 @@
} else {
   con = (TcpConnection) perThrData[0];
   perThrData = (Object []) perThrData[1];
  -if ( con == null )
  -continue;
}

con.setEndpoint(endpoint);
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper EmbededServletOptions.java

2003-01-01 Thread remm 
remm2003/01/01 07:21:01

  Modified:jasper2/src/share/org/apache/jasper
EmbededServletOptions.java
  Log:
  - Due to continued problems with javac, I think fork should default to true.
  
  Revision  ChangesPath
  1.17  +4 -4  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbededServletOptions.java
  
  Index: EmbededServletOptions.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbededServletOptions.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- EmbededServletOptions.java31 Dec 2002 14:01:17 -  1.16
  +++ EmbededServletOptions.java1 Jan 2003 15:21:01 -   1.17
  @@ -93,7 +93,7 @@
   /**
* Should Ant fork its java compiles of JSP pages.
*/
  -public boolean fork = false;
  +public boolean fork = true;
   
   /**
* Do you want to keep the generated Java files around?
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-catalina/catalina/src/conf web.xml

2003-01-01 Thread remm 
remm2003/01/01 07:21:40

  Modified:catalina/src/conf web.xml
  Log:
  - Due to continued problems with javac, I think fork should default to true.
  
  Revision  ChangesPath
  1.11  +1 -1  jakarta-tomcat-catalina/catalina/src/conf/web.xml
  
  Index: web.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/web.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- web.xml   31 Dec 2002 14:12:31 -  1.10
  +++ web.xml   1 Jan 2003 15:21:40 -   1.11
  @@ -113,7 +113,7 @@
 
 
 
  -  
  +  
 
 
 
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-catalina/webapps/docs jasper-howto.xml

2003-01-01 Thread remm 
remm2003/01/01 07:26:34

  Modified:webapps/docs jasper-howto.xml
  Log:
  - Due to continued problems with javac, I think fork should default to true.
  
  Revision  ChangesPath
  1.4   +6 -3  jakarta-tomcat-catalina/webapps/docs/jasper-howto.xml
  
  Index: jasper-howto.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/jasper-howto.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jasper-howto.xml  31 Dec 2002 14:48:44 -  1.3
  +++ jasper-howto.xml  1 Jan 2003 15:26:34 -   1.4
  @@ -116,7 +116,7 @@
   
   fork - Have Ant fork JSP page compiles so they are
   performed in a seperate JVM from Tomcat? true or
  -false, default false.
  +false, default true.
   
   javaEncoding - Java file encoding to use for generating
   java source files. Default UTF8.
  @@ -159,10 +159,13 @@
   fork - The internal JVM javac compiler used by Ant
   has a known memory leak. And Ant requires that java compiles be synchronized,
   i.e. only one JSP page can be compiled at a time.  Set fork to
  -true so that Ant compiles JSP pages in a seperate JVM.
  +true or do not define it (it is the default value) so that Ant 
  +compiles JSP pages in a seperate JVM.
   This removes the synchronization of JSP page compiles and prevents
   all the javac classes from being instantiated and subsequently garbage
  -collected by the JVM Tomcat is running in.
  +collected by the JVM Tomcat is running in. This also works around known 
  +issues with javac, including memory leaking, as well as JAR file locking
  +on Windows.
   
   
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

DO NOT REPLY [Bug 15754] New: - PageContext.setAttribute doesn't throw NullPointerException

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

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15754

PageContext.setAttribute doesn't throw NullPointerException

   Summary: PageContext.setAttribute doesn't throw
NullPointerException
   Product: Tomcat 4
   Version: 4.1.18
  Platform: Other
OS/Version: Other
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Servlet & JSP API
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


PageContext.setAttribute doesn't thow a NullPointerException if the attribute-
value if null as 
http://java.sun.com/products/servlet/2.2/javadoc/javax/servlet/jsp/PageContext.h
tml#setAttribute(java.lang.String,%20java.lang.Object,%20int) requires.

is !silently ignores! that null was specified. the attribute isn't set to null, 
but isdn't removed too and getAttribute returnes the old value.

--
To unsubscribe, e-mail:   
For additional commands, e-mail: