[Exist-commits] eXist-1.0/src/org/exist/schema GenericSchemaService.java,1.2,1.3

[Sebastian B. <bo...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/schema
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2521/src/org/exist/schema

Modified Files:
	GenericSchemaService.java 
Log Message:
fix bug in reading new schemas from file upon import

Index: GenericSchemaService.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/schema/GenericSchemaService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GenericSchemaService.java	10 Aug 2004 14:19:23 -0000	1.2
--- GenericSchemaService.java	29 Aug 2004 17:42:48 -0000	1.3
***************
*** 374,379 ****
  		XMLResource resource = getSchema(namespaceURI);
  		try {
! 			Schema schema = (new SchemaReader((String) resource.getContent())).read();
! 			return schema;
  		} catch (IOException e) {
  			throw new XMLDBException(ErrorCodes.VENDOR_ERROR, "Error reading schema information for target namespace: " + namespaceURI, e);
--- 374,380 ----
  		XMLResource resource = getSchema(namespaceURI);
  		try {
! 		  //TODO does the next line have to be this complicated?
! 		  Schema schema = (new SchemaReader(new InputSource(new StringReader((String) resource.getContent())))).read();
! 		  return schema;		
  		} catch (IOException e) {
  			throw new XMLDBException(ErrorCodes.VENDOR_ERROR, "Error reading schema information for target namespace: " + namespaceURI, e);
***************
*** 463,467 ****
      if (updateService == null)
        updateService = (XUpdateQueryService) getSchemasCollection().getService("XUpdateQueryService", "1.0");
!     ;
      return updateService;
    }
--- 464,468 ----
      if (updateService == null)
        updateService = (XUpdateQueryService) getSchemasCollection().getService("XUpdateQueryService", "1.0");
!     
      return updateService;
    }