cvs commit: cocoon-2.1/src/blocks/jms/java/org/apache/cocoon/components/jms JMSConnectionImpl.java

[cziegeler]

cziegeler    2004/04/30 04:36:26

  Modified:    src/blocks/jms/java/org/apache/cocoon/components/jms
                        JMSConnectionImpl.java
  Log:
  Prevent NPE (on shutdown)
  
  Revision  Changes    Path
  1.12      +7 -3      
cocoon-2.1/src/blocks/jms/java/org/apache/cocoon/components/jms/JMSConnectionImpl.java
  
  Index: JMSConnectionImpl.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/jms/java/org/apache/cocoon/components/jms/JMSConnectionImpl.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- JMSConnectionImpl.java    5 Mar 2004 13:01:57 -0000       1.11
  +++ JMSConnectionImpl.java    30 Apr 2004 11:36:26 -0000      1.12
  @@ -294,8 +294,12 @@
               }
               this.subscribers.clear();
           }
  -        this.session.close();
  -        this.connection.close();
  +        if ( this.session != null ) {
  +            this.session.close();
  +        }
  +        if ( this.connection != null ) {
  +            this.connection.close();
  +        }
       }
   
   }