tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From billbar...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common ChannelSocket.java ChannelUn.java
Date Sat, 20 Nov 2004 02:39:34 GMT
billbarker    2004/11/19 18:39:34

  Modified:    jk/java/org/apache/jk/common ChannelSocket.java
                        ChannelUn.java
  Log:
  It seems that the 1.5 JVM is less tolarant of 'null' ONames.
  
  Reported By: Allistair Crossley Allistair.Crossley@QAS.com
  
  Revision  Changes    Path
  1.49      +3 -1      jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java
  
  Index: ChannelSocket.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- ChannelSocket.java	17 Sep 2004 04:08:53 -0000	1.48
  +++ ChannelSocket.java	20 Nov 2004 02:39:34 -0000	1.49
  @@ -703,7 +703,9 @@
                   Request req = (Request)ep.getRequest();
                   if( req != null ) {
                       ObjectName roname = (ObjectName)ep.getNote(JMXRequestNote);
  -                    Registry.getRegistry().unregisterComponent(roname);
  +                    if( roname != null ) {
  +                        Registry.getRegistry().unregisterComponent(roname);
  +                    }
                       req.getRequestProcessor().setGlobalProcessor(null);
                   }
               } catch( Exception ee) {
  
  
  
  1.29      +3 -1      jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUn.java
  
  Index: ChannelUn.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUn.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- ChannelUn.java	31 May 2004 04:48:54 -0000	1.28
  +++ ChannelUn.java	20 Nov 2004 02:39:34 -0000	1.29
  @@ -312,7 +312,9 @@
                   Request req = (Request)ep.getRequest();
                   if( req != null ) {
                       ObjectName roname = (ObjectName)ep.getNote(JMXRequestNote);
  -                    Registry.getRegistry().unregisterComponent(roname);
  +                    if( roname != null ) {
  +                        Registry.getRegistry().unregisterComponent(roname);
  +                    }
                       req.getRequestProcessor().setGlobalProcessor(null);
                   }
               } catch( Exception ee) {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message