You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by ch...@apache.org on 2006/04/04 21:23:31 UTC

svn commit: r391390 - in /webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl: builder/StAXBuilder.java dom/DOMStAXWrapper.java

Author: chinthaka
Date: Tue Apr  4 12:23:28 2006
New Revision: 391390

URL: http://svn.apache.org/viewcvs?rev=391390&view=rev
Log:
Fixing build break.
Fixing changes pointed out in 
http://mail-archives.apache.org/mod_mbox/ws-commons-dev/200604.mbox/ajax/%3c1144170124.23083.2.camel@localhost.localdomain%3e


Modified:
    webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/builder/StAXBuilder.java
    webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java

Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/builder/StAXBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/builder/StAXBuilder.java?rev=391390&r1=391389&r2=391390&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/builder/StAXBuilder.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/builder/StAXBuilder.java Tue Apr  4 12:23:28 2006
@@ -77,8 +77,8 @@
      */
     protected boolean parserAccessed = false;
     protected OMDocument document;
-    private static final String IS_BINARY = "IsOptimized";
-    private static final String DATA_HANDLER = "DataHandler";
+    private static final String IS_BINARY = "Axiom.IsBinary";
+    private static final String DATA_HANDLER = "Axiom.DataHandler";
 
 
     /**
@@ -192,11 +192,12 @@
                 OMText text = omfactory.createText(dataHandler, true);
                 omElement.addChild(text);
                 return text;
-            } else {
-                return omfactory.createText(omElement, parser.getText(), textType);
             }
         } catch (IllegalArgumentException e) {
+            // nothing to be done here. This is handled in finally case
+        } finally {
             return omfactory.createText(omElement, parser.getText(), textType);
+
         }
     }
 

Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java
URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java?rev=391390&r1=391389&r2=391390&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java Tue Apr  4 12:23:28 2006
@@ -877,7 +877,7 @@
      * @throws IllegalArgumentException
      */
     public Object getProperty(String s) throws IllegalArgumentException {
-        throw new UnsupportedOperationException();
+        throw new IllegalArgumentException();
     }
 
     /**