You are viewing a plain text version of this content. The canonical link for it is here.
Posted to woden-dev@ws.apache.org by jk...@apache.org on 2008/01/11 04:08:08 UTC

svn commit: r611031 - in /webservices/woden/trunk/java/src/org/apache/woden: internal/ internal/wsdl20/ internal/xml/ wsdl20/extensions/http/ wsdl20/fragids/ xpointer/

Author: jkaputin
Date: Thu Jan 10 19:08:00 2008
New Revision: 611031

URL: http://svn.apache.org/viewvc?rev=611031&view=rev
Log:
Changed use of "" literal to a static final intern.

Modified:
    webservices/woden/trunk/java/src/org/apache/woden/internal/DOMWSDLReader.java
    webservices/woden/trunk/java/src/org/apache/woden/internal/wsdl20/ComponentModelBuilder.java
    webservices/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java
    webservices/woden/trunk/java/src/org/apache/woden/internal/wsdl20/WSDLElementImpl.java
    webservices/woden/trunk/java/src/org/apache/woden/internal/xml/QNameListAttrImpl.java
    webservices/woden/trunk/java/src/org/apache/woden/internal/xml/QNameListOrTokenAnyAttrImpl.java
    webservices/woden/trunk/java/src/org/apache/woden/wsdl20/extensions/http/HTTPLocation.java
    webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/BindingFaultPart.java
    webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/BindingFaultReferencePart.java
    webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/BindingMessageReferencePart.java
    webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/BindingOperationPart.java
    webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/ElementDeclarationPart.java
    webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/InterfaceFaultReferencePart.java
    webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/TypeDefinitionPart.java
    webservices/woden/trunk/java/src/org/apache/woden/xpointer/XPointer.java
    webservices/woden/trunk/java/src/org/apache/woden/xpointer/XPointerParser.java

Modified: webservices/woden/trunk/java/src/org/apache/woden/internal/DOMWSDLReader.java
URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/src/org/apache/woden/internal/DOMWSDLReader.java?rev=611031&r1=611030&r2=611031&view=diff
==============================================================================
--- webservices/woden/trunk/java/src/org/apache/woden/internal/DOMWSDLReader.java (original)
+++ webservices/woden/trunk/java/src/org/apache/woden/internal/DOMWSDLReader.java Thu Jan 10 19:08:00 2008
@@ -74,6 +74,8 @@
  */
 public class DOMWSDLReader extends BaseWSDLReader {
     
+    private static final String emptyString = "".intern();
+    
     //a map of imported schema definitions keyed by schema location URI
     private Map fImportedSchemas = new Hashtable();
     
@@ -453,7 +455,7 @@
             String localName = domAttr.getLocalName();
             String namespaceURI = domAttr.getNamespaceURI();
             String prefix = domAttr.getPrefix();
-            QName attrType = new QName(namespaceURI, localName, (prefix != null ? prefix : ""));
+            QName attrType = new QName(namespaceURI, localName, (prefix != null ? prefix : emptyString));
             String attrValue = domAttr.getValue();
                     
             if (namespaceURI != null && !namespaceURI.equals(Constants.NS_STRING_WSDL20))

Modified: webservices/woden/trunk/java/src/org/apache/woden/internal/wsdl20/ComponentModelBuilder.java
URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/src/org/apache/woden/internal/wsdl20/ComponentModelBuilder.java?rev=611031&r1=611030&r2=611031&view=diff
==============================================================================
--- webservices/woden/trunk/java/src/org/apache/woden/internal/wsdl20/ComponentModelBuilder.java (original)
+++ webservices/woden/trunk/java/src/org/apache/woden/internal/wsdl20/ComponentModelBuilder.java Thu Jan 10 19:08:00 2008
@@ -73,6 +73,8 @@
  *         Interface Operation extensions, - added Endpoint extensions
  */
 public class ComponentModelBuilder {
+    
+    private static final String emptyString = "".intern();
 
 	// TODO support for other (non-Schema) type systems
 
@@ -314,7 +316,7 @@
                 //so replace it with the including schema's tns.
                 tdQN = new QName(schemaTns, xstQN.getLocalPart(), xstQN.getPrefix());
             }
-            if(tdQN.getPrefix() == "" || tdQN.getPrefix() == null) {
+            if(tdQN.getPrefix() == emptyString || tdQN.getPrefix() == null) {
                 //if a prefix has been declared for this NS uri, include it in the qname
                 String pfx = prefixes.getPrefix(tdQN.getNamespaceURI());
                 if(pfx != null) {

Modified: webservices/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java
URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java?rev=611031&r1=611030&r2=611031&view=diff
==============================================================================
--- webservices/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java (original)
+++ webservices/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java Thu Jan 10 19:08:00 2008
@@ -67,6 +67,8 @@
 public class DescriptionImpl extends WSDLComponentImpl
                              implements Description, DescriptionElement 
 {
+    private static final String emptyString = "".intern();
+    
     /*
      * WSDL Component model data (flattened properties of Description Component)
      * TODO cache top-level components here with a flush-on-update mechanism
@@ -627,7 +629,7 @@
         DescriptionElement desc = ((DescriptionElement) wElem);
         
         //Find its target name and prefix.
-        String[] namespace = new String[] {"", ""};
+        String[] namespace = new String[] {emptyString, emptyString};
         URI tns = desc.getTargetNamespace();
         if (tns != null) {
             namespace[0] = tns.toString();

Modified: webservices/woden/trunk/java/src/org/apache/woden/internal/wsdl20/WSDLElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/src/org/apache/woden/internal/wsdl20/WSDLElementImpl.java?rev=611031&r1=611030&r2=611031&view=diff
==============================================================================
--- webservices/woden/trunk/java/src/org/apache/woden/internal/wsdl20/WSDLElementImpl.java (original)
+++ webservices/woden/trunk/java/src/org/apache/woden/internal/wsdl20/WSDLElementImpl.java Thu Jan 10 19:08:00 2008
@@ -43,6 +43,7 @@
  */
 public class WSDLElementImpl implements WSDLElement 
 {
+    private static final String emptyString = "".intern();
     private AttributeExtensibleImpl fAttrExt = new AttributeExtensibleImpl();
     private ElementExtensibleImpl fElemExt = new ElementExtensibleImpl();
     private Map namespaceToPrefixMap = new HashMap();
@@ -145,7 +146,7 @@
     }
     
     public void addNamespace(String prefix, URI namespace) {
-        prefix = (prefix != null) ? prefix : "";
+        prefix = (prefix != null) ? prefix : emptyString;
         if (namespace == null) {
             removeNamespace(prefix);
         } else {
@@ -155,7 +156,7 @@
     }
     
     public URI removeNamespace(String prefix) {
-        prefix = (prefix != null) ? prefix : "";
+        prefix = (prefix != null) ? prefix : emptyString;
         URI namespaceURI = (URI)prefixToNamespaceMap.remove(prefix);
         namespaceToPrefixMap.remove(namespaceURI);
         return namespaceURI;
@@ -173,6 +174,7 @@
     
     public URI getNamespaceURI(String prefix) {
         //See if the prefix is local.
+        prefix = (prefix != null) ? prefix : emptyString;
         URI namespace = (URI)prefixToNamespaceMap.get(prefix);
         if (namespace == null && this instanceof NestedElement) { //If not call parents to find prefix if I'm nested.
             return ((NestedElement)this).getParentElement().getNamespaceURI(prefix);

Modified: webservices/woden/trunk/java/src/org/apache/woden/internal/xml/QNameListAttrImpl.java
URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/src/org/apache/woden/internal/xml/QNameListAttrImpl.java?rev=611031&r1=611030&r2=611031&view=diff
==============================================================================
--- webservices/woden/trunk/java/src/org/apache/woden/internal/xml/QNameListAttrImpl.java (original)
+++ webservices/woden/trunk/java/src/org/apache/woden/internal/xml/QNameListAttrImpl.java Thu Jan 10 19:08:00 2008
@@ -37,6 +37,7 @@
  */
 public class QNameListAttrImpl extends XMLAttrImpl implements QNameListAttr 
 {
+    private static final String emptyString = "".intern();
     public QNameListAttrImpl(XMLElement ownerEl, QName attrType, 
             String attrValue, ErrorReporter errRpt) throws WSDLException
     {
@@ -65,7 +66,7 @@
      */
     protected Object convert(XMLElement ownerEl, String attrValue) throws WSDLException
     {
-        if(attrValue == null || "".equals(attrValue))
+        if(attrValue == null || emptyString.equals(attrValue))
         {
             setValid(false);
             getErrorReporter().reportError(

Modified: webservices/woden/trunk/java/src/org/apache/woden/internal/xml/QNameListOrTokenAnyAttrImpl.java
URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/src/org/apache/woden/internal/xml/QNameListOrTokenAnyAttrImpl.java?rev=611031&r1=611030&r2=611031&view=diff
==============================================================================
--- webservices/woden/trunk/java/src/org/apache/woden/internal/xml/QNameListOrTokenAnyAttrImpl.java (original)
+++ webservices/woden/trunk/java/src/org/apache/woden/internal/xml/QNameListOrTokenAnyAttrImpl.java Thu Jan 10 19:08:00 2008
@@ -39,6 +39,7 @@
 public class QNameListOrTokenAnyAttrImpl extends XMLAttrImpl 
                                          implements QNameListOrTokenAttr 
 {
+    private static final String emptyString = "".intern();
     public QNameListOrTokenAnyAttrImpl(XMLElement ownerEl, QName attrType, 
             String attrValue, ErrorReporter errRpt) throws WSDLException
     {
@@ -107,7 +108,7 @@
         if("#any".equals(attrValue)) return attrValue;
         
         //Second, assume the attribute contains a list of xs:QName.
-        if(attrValue == null || "".equals(attrValue))
+        if(attrValue == null || emptyString.equals(attrValue))
         {
             setValid(false);
             getErrorReporter().reportError(

Modified: webservices/woden/trunk/java/src/org/apache/woden/wsdl20/extensions/http/HTTPLocation.java
URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/src/org/apache/woden/wsdl20/extensions/http/HTTPLocation.java?rev=611031&r1=611030&r2=611031&view=diff
==============================================================================
--- webservices/woden/trunk/java/src/org/apache/woden/wsdl20/extensions/http/HTTPLocation.java (original)
+++ webservices/woden/trunk/java/src/org/apache/woden/wsdl20/extensions/http/HTTPLocation.java Thu Jan 10 19:08:00 2008
@@ -72,13 +72,13 @@
     private List fValidatedList = null; //used for validating the HTTP location string
     private List fConsolidatedList = null; //used for substitution and formatting
     
-    private final String emptyString = "".intern();
-    private final String questionMark = "?".intern();
-    private final String leftBrace = "{".intern();
-    private final String rightBrace = "}".intern();
-    private final String doubleLeftBraces = "{{".intern();
-    private final String doubleRightBraces = "}}".intern();
-    private final String exclamatedLeftBrace = "{!".intern();
+    private static final String emptyString = "".intern();
+    private static final String questionMark = "?".intern();
+    private static final String leftBrace = "{".intern();
+    private static final String rightBrace = "}".intern();
+    private static final String doubleLeftBraces = "{{".intern();
+    private static final String doubleRightBraces = "}}".intern();
+    private static final String exclamatedLeftBrace = "{!".intern();
     
     /**
      * Creates an HTTPLocation object to represent the specified HTTP Location String value.

Modified: webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/BindingFaultPart.java
URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/BindingFaultPart.java?rev=611031&r1=611030&r2=611031&view=diff
==============================================================================
--- webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/BindingFaultPart.java (original)
+++ webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/BindingFaultPart.java Thu Jan 10 19:08:00 2008
@@ -27,6 +27,7 @@
  *
  */
 public class BindingFaultPart implements ComponentPart {
+    private static final String emptyString = "".intern();
     private final NCName binding; //Local name of the parent Binding component.
     private QName fault;    //Name of the Interface Fault referred to by this Binding Fault component.
 
@@ -55,7 +56,7 @@
      * @return a String the serialised Binding Fault Pointer Part.
      */
     public String toString() {
-        String faultString = (fault.getPrefix() != null && !fault.getPrefix().equals("") ? fault.getPrefix() + ":" + fault.getLocalPart() : fault.getLocalPart());
+        String faultString = (fault.getPrefix() != null && !fault.getPrefix().equals(emptyString) ? fault.getPrefix() + ":" + fault.getLocalPart() : fault.getLocalPart());
         return "wsdl.bindingFault(" + binding + "/" + faultString + ")";
     }
 }

Modified: webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/BindingFaultReferencePart.java
URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/BindingFaultReferencePart.java?rev=611031&r1=611030&r2=611031&view=diff
==============================================================================
--- webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/BindingFaultReferencePart.java (original)
+++ webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/BindingFaultReferencePart.java Thu Jan 10 19:08:00 2008
@@ -28,6 +28,7 @@
  *
  */
 public class BindingFaultReferencePart implements ComponentPart {
+    private static final String emptyString = "".intern();
     private final NCName binding;     //Local name of the parent Binding component.
     private QName operation;    //Name of the Interface Operation referred to by the parent Binding Operation component.
     private final NCName message;     //Message Label of the Interface Fault Reference component referred to by this Binding Fault Reference component.
@@ -64,8 +65,8 @@
      * @return a String the serialised Binding Fault Reference Pointer Part.
      */
     public String toString() {
-        String operationString = (operation.getPrefix() != null  && !operation.getPrefix().equals("") ? operation.getPrefix() + ":" + operation.getLocalPart() : operation.getLocalPart());
-        String faultString = (fault.getPrefix() != null  && !fault.getPrefix().equals("") ? fault.getPrefix() + ":" + fault.getLocalPart() : fault.getLocalPart());
+        String operationString = (operation.getPrefix() != null  && !operation.getPrefix().equals(emptyString) ? operation.getPrefix() + ":" + operation.getLocalPart() : operation.getLocalPart());
+        String faultString = (fault.getPrefix() != null  && !fault.getPrefix().equals(emptyString) ? fault.getPrefix() + ":" + fault.getLocalPart() : fault.getLocalPart());
         return "wsdl.bindingFaultReference(" + binding + "/" + operationString + "/" + message + "/" + faultString + ")";
     }
 }

Modified: webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/BindingMessageReferencePart.java
URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/BindingMessageReferencePart.java?rev=611031&r1=611030&r2=611031&view=diff
==============================================================================
--- webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/BindingMessageReferencePart.java (original)
+++ webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/BindingMessageReferencePart.java Thu Jan 10 19:08:00 2008
@@ -28,6 +28,7 @@
  *
  */
 public class BindingMessageReferencePart implements ComponentPart {
+    private static final String emptyString = "".intern();
     private final NCName binding;     //Local name of the parent Binding component.
     private QName operation;    //Name of the Interface Operation referred to the parent Binding Operation component.
     private final NCName message;     //Message Label of the Interface Message Reference component referred to by this Binding Message Reference component.
@@ -59,7 +60,7 @@
      * @return a String the serialised Binding Message Reference Pointer Part.
      */
     public String toString() {
-        String operationString = (operation.getPrefix() != null && !operation.getPrefix().equals("") ? operation.getPrefix() + ":" + operation.getLocalPart() : operation.getLocalPart());
+        String operationString = (operation.getPrefix() != null && !operation.getPrefix().equals(emptyString) ? operation.getPrefix() + ":" + operation.getLocalPart() : operation.getLocalPart());
         return "wsdl.bindingMessageReference(" + binding + "/" + operationString + "/" + message + ")";
     }
 }

Modified: webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/BindingOperationPart.java
URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/BindingOperationPart.java?rev=611031&r1=611030&r2=611031&view=diff
==============================================================================
--- webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/BindingOperationPart.java (original)
+++ webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/BindingOperationPart.java Thu Jan 10 19:08:00 2008
@@ -28,6 +28,7 @@
  *
  */
 public class BindingOperationPart implements ComponentPart {
+    private static final String emptyString = "".intern();
     private final NCName binding;     //Local name of the parent Binding component.
     private QName operation;    //Name of the Interface Operation component referred to by this Binding Operation component.
     
@@ -56,7 +57,7 @@
      * @return a String the serialised Binding Operation Pointer Part.
      */
     public String toString() {
-        String operationString = (operation.getPrefix() != null && !operation.getPrefix().equals("") ? operation.getPrefix() + ":" + operation.getLocalPart() : operation.getLocalPart());
+        String operationString = (operation.getPrefix() != null && !operation.getPrefix().equals(emptyString) ? operation.getPrefix() + ":" + operation.getLocalPart() : operation.getLocalPart());
         return "wsdl.bindingOperation(" + binding + "/" + operationString + ")";
     }
 }

Modified: webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/ElementDeclarationPart.java
URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/ElementDeclarationPart.java?rev=611031&r1=611030&r2=611031&view=diff
==============================================================================
--- webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/ElementDeclarationPart.java (original)
+++ webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/ElementDeclarationPart.java Thu Jan 10 19:08:00 2008
@@ -31,6 +31,7 @@
  *
  */
 public class ElementDeclarationPart implements ComponentPart {
+    private static final String emptyString = "".intern();
     private QName element;    //Name of the Element Declaration component.
     private final URI system;       //Namespace absolute IRI of the extension type system used for the Element Declaration component.
 
@@ -85,7 +86,7 @@
      * @return a String the serialised Element Declaration Pointer Part.
      */
     public String toString() {
-        String elementString = (element.getPrefix() != null && !element.getPrefix().equals("") ? element.getPrefix() + ":" + element.getLocalPart() : element.getLocalPart());
+        String elementString = (element.getPrefix() != null && !element.getPrefix().equals(emptyString) ? element.getPrefix() + ":" + element.getLocalPart() : element.getLocalPart());
         if (system == null) {
             return "wsdl.elementDeclaration(" + elementString + ")";
         } else {

Modified: webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/InterfaceFaultReferencePart.java
URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/InterfaceFaultReferencePart.java?rev=611031&r1=611030&r2=611031&view=diff
==============================================================================
--- webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/InterfaceFaultReferencePart.java (original)
+++ webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/InterfaceFaultReferencePart.java Thu Jan 10 19:08:00 2008
@@ -28,6 +28,7 @@
  *
  */
 public class InterfaceFaultReferencePart implements ComponentPart {
+    private static final String emptyString = "".intern();
     private final NCName interfaceName; //Local name of the parent Interface component.
     private final NCName operation;      //Name of the parent Interface Operation component.
     private final NCName message;       //Message Label of the Interface Fault Reference component.
@@ -62,7 +63,7 @@
      * @return a String the serialised Binding Fault Reference Pointer Part.
      */
     public String toString() {
-        String faultString = (fault.getPrefix() != null && !fault.getPrefix().equals("") ? fault.getPrefix() + ":" + fault.getLocalPart() : fault.getLocalPart());
+        String faultString = (fault.getPrefix() != null && !fault.getPrefix().equals(emptyString) ? fault.getPrefix() + ":" + fault.getLocalPart() : fault.getLocalPart());
         return "wsdl.interfaceFaultReference(" + interfaceName + "/" + operation + "/" + message + "/" + faultString + ")";
     }
 }

Modified: webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/TypeDefinitionPart.java
URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/TypeDefinitionPart.java?rev=611031&r1=611030&r2=611031&view=diff
==============================================================================
--- webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/TypeDefinitionPart.java (original)
+++ webservices/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/TypeDefinitionPart.java Thu Jan 10 19:08:00 2008
@@ -30,6 +30,7 @@
  *
  */
 public class TypeDefinitionPart implements ComponentPart{
+    private static final String emptyString = "".intern();
     private QName type;   //Name of the Type Definition component.
     private final URI system;   //Namespace absolute IRI of the extension type system used for the Type Definition component.
 
@@ -80,7 +81,7 @@
      * @return a String the serialised Type Definition Pointer Part.
      */
     public String toString() {
-        String typeString = (type.getPrefix() != null && !type.getPrefix().equals("") ? type.getPrefix() + ":" + type.getLocalPart() : type.getLocalPart());
+        String typeString = (type.getPrefix() != null && !type.getPrefix().equals(emptyString) ? type.getPrefix() + ":" + type.getLocalPart() : type.getLocalPart());
         if (system == null) {
             return "wsdl.typeDefinition(" + typeString + ")";
         } else {

Modified: webservices/woden/trunk/java/src/org/apache/woden/xpointer/XPointer.java
URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/src/org/apache/woden/xpointer/XPointer.java?rev=611031&r1=611030&r2=611031&view=diff
==============================================================================
--- webservices/woden/trunk/java/src/org/apache/woden/xpointer/XPointer.java (original)
+++ webservices/woden/trunk/java/src/org/apache/woden/xpointer/XPointer.java Thu Jan 10 19:08:00 2008
@@ -35,12 +35,13 @@
  * 
  */
 public class XPointer {
+    private static final String emptyString = "".intern();
     private final Map prefixBindingContex;
     private final Map namespaceBindingContex;
     private NCName shorthandPointer;
     private final List pointerParts;
     
-    private static final NCName emptyNCName = new NCName("");
+    private static final NCName emptyNCName = new NCName(emptyString);
     
     private static final String NS_URI_XML = "http://www.w3.org/XML/1998/namespace";
     private static final String NS_URI_XMLNS = "http://www.w3.org/2000/xmlns/";
@@ -67,8 +68,8 @@
      */
     public XPointer(String xpointerString) throws InvalidXPointerException {
         this(); //Construct a new XPointer.
-        if (xpointerString == null || xpointerString.equals(""))
-            throw new InvalidXPointerException("The XPointer string is either null or empty", "");
+        if (xpointerString == null || xpointerString.equals(emptyString))
+            throw new InvalidXPointerException("The XPointer string is either null or empty", emptyString);
         XPointerParser.parseXPointer(xpointerString, this); //Parse the string and add the Pointers to the new XPointer.
     }
     

Modified: webservices/woden/trunk/java/src/org/apache/woden/xpointer/XPointerParser.java
URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/src/org/apache/woden/xpointer/XPointerParser.java?rev=611031&r1=611030&r2=611031&view=diff
==============================================================================
--- webservices/woden/trunk/java/src/org/apache/woden/xpointer/XPointerParser.java (original)
+++ webservices/woden/trunk/java/src/org/apache/woden/xpointer/XPointerParser.java Thu Jan 10 19:08:00 2008
@@ -36,6 +36,7 @@
  */
 final class XPointerParser {
 
+    private static final String emptyString = "".intern();
     /**
      * Parses a String XPointer and stores the results into the given XPointer object.
      * 
@@ -419,7 +420,7 @@
                         }
 
                         name = data.substring(nameOffset, currentOffset).intern();
-                        prefix = "".intern();
+                        prefix = emptyString;
 
                         // The name is a QName => a SchemeName
                         if (ch == ':') {



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