cvs commit: xml-xindice/java/src/org/apache/xindice/client/xmldb/resources XMLResourceImpl.java

[vgritsenko]

vgritsenko    2003/12/23 18:31:20

  Modified:    java/src/org/apache/xindice/client/xmldb/resources
                        XMLResourceImpl.java
  Log:
  minor refactoring
  
  Revision  Changes    Path
  1.18      +7 -13     
xml-xindice/java/src/org/apache/xindice/client/xmldb/resources/XMLResourceImpl.java
  
  Index: XMLResourceImpl.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xindice/java/src/org/apache/xindice/client/xmldb/resources/XMLResourceImpl.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- XMLResourceImpl.java      22 Dec 2003 14:07:13 -0000      1.17
  +++ XMLResourceImpl.java      24 Dec 2003 02:31:20 -0000      1.18
  @@ -359,8 +359,9 @@
           if (bytes != null) {
               DocumentImpl doc = new DocumentImpl(bytes, symbols, null);
               return TextWriter.toString(doc);
  -        } else
  +        } else {
               return content;
  +        }
       }
   
       /**
  @@ -397,37 +398,30 @@
                   events.setFeature(SAX_NAMESPACES_FEATURE, hasSaxNamespaces);
                   events.setFeature(SAX_NAMESPACE_PREFIXES_FEATURE, 
hasSaxNamespacesPrefixes);
                   events.setContentHandler(handler);
  -
                   if (handler instanceof ErrorHandler) {
                       events.setErrorHandler((ErrorHandler) handler);
                   }
   
                   events.start();
  -            } else {
  +            } else if (content != null) {
                   SAXParser sp = saxFactory.newSAXParser();
                   XMLReader xr = sp.getXMLReader();
   
                   xr.setFeature(SAX_NAMESPACES_FEATURE, hasSaxNamespaces);
  -                xr.setFeature(SAX_NAMESPACE_PREFIXES_FEATURE,
  -                              hasSaxNamespacesPrefixes);
  +                xr.setFeature(SAX_NAMESPACE_PREFIXES_FEATURE, 
hasSaxNamespacesPrefixes);
                   xr.setContentHandler(handler);
  -
                   if (handler instanceof ErrorHandler) {
                       xr.setErrorHandler((ErrorHandler) handler);
                   }
   
  -                if (content != null) {
  -                    xr.parse(new InputSource(new StringReader(content)));
  -                }
  +                xr.parse(new InputSource(new StringReader(content)));
               }
           } catch (Exception e) {
               throw FaultCodes.createXMLDBException(e);
           }
       }
   
  -
       public void setId(String name) {
  -
           this.id = name;
       }
   }