[Beepcore-java-commits] CVS: beepcore-java/src/org/beepcore/beep/profile/sasl Blob.java,1.5,1.6

[Huston F. <hu...@us...>]

Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl
In directory usw-pr-cvs1:/tmp/cvs-serv598/src/org/beepcore/beep/profile/sasl

Modified Files:
	Blob.java 
Log Message:
removed static DocumentBuilder

Index: Blob.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl/Blob.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Blob.java	29 Nov 2001 04:00:00 -0000	1.5
--- Blob.java	4 May 2002 22:42:41 -0000	1.6
***************
*** 3,6 ****
--- 3,7 ----
   *
   * Copyright (c) 2001 Invisible Worlds, Inc.  All rights reserved.
+  * Copyright (c) 2002 Huston Franklin.  All rights reserved.
   *
   * The contents of this file are subject to the Blocks Public License (the
***************
*** 71,75 ****
      private static BASE64Decoder decoder;
      private static BASE64Encoder encoder;
-     private static DocumentBuilder builder;    // generic XML parser
      private static boolean initialized = false;
      
--- 72,75 ----
***************
*** 79,82 ****
--- 79,83 ----
      private String stringified;
      private byte[] decodedData;
+     private DocumentBuilder builder;    // generic XML parser
  
      /**
***************
*** 97,100 ****
--- 98,108 ----
          }
  
+         try {
+             builder =
+                 DocumentBuilderFactory.newInstance().newDocumentBuilder();
+         } catch (ParserConfigurationException e) {
+             throw new SASLException(ERR_XML_PARSE_FAILURE);
+         }
+ 
          // Validate status
          if (!validateStatus(status)) {
***************
*** 142,145 ****
--- 150,160 ----
          }
  
+         try {
+             builder =
+                 DocumentBuilderFactory.newInstance().newDocumentBuilder();
+         } catch (ParserConfigurationException e) {
+             throw new SASLException(ERR_XML_PARSE_FAILURE);
+         }
+ 
          // Validate status
          if (!validateStatus(status)) {
***************
*** 196,199 ****
--- 211,221 ----
          }
  
+         try {
+             builder =
+                 DocumentBuilderFactory.newInstance().newDocumentBuilder();
+         } catch (ParserConfigurationException e) {
+             throw new SASLException(ERR_XML_PARSE_FAILURE);
+         }
+ 
          // Validate status
          if (!validateStatus(status)) {
***************
*** 242,245 ****
--- 264,274 ----
              init();
          }
+ 
+         try {
+             builder =
+                 DocumentBuilderFactory.newInstance().newDocumentBuilder();
+         } catch (ParserConfigurationException e) {
+             throw new SASLException(ERR_XML_PARSE_FAILURE);
+         }
          
          stringified = blob;
***************
*** 294,305 ****
          }
  
-         if (builder == null) {
-             try {
-                 builder =
-                     DocumentBuilderFactory.newInstance().newDocumentBuilder();
-             } catch (ParserConfigurationException e) {
-                 throw new SASLException(ERR_XML_PARSE_FAILURE);
-             }
-         }
          if(statusMappings == null) {
              statusMappings = new String[STATUS_LIMIT];
--- 323,326 ----
***************
*** 363,367 ****
       * @throws SASLException
       */
!     private static Element processMessage(String blob) 
          throws SASLException
      {
--- 384,388 ----
       * @throws SASLException
       */
!     private Element processMessage(String blob) 
          throws SASLException
      {
***************
*** 404,408 ****
       *
       */
!     private static String extractStatusFromBlob(String blob)
              throws SASLException
      {
--- 425,429 ----
       *
       */
!     private String extractStatusFromBlob(String blob)
              throws SASLException
      {
***************
*** 430,434 ****
       *
       */
!     private static String extractDataFromBlob(String blob) throws SASLException
      {
          if (blob == null) {
--- 451,455 ----
       *
       */
!     private String extractDataFromBlob(String blob) throws SASLException
      {
          if (blob == null) {