fix raster startup for raster without pyramid (not recommended)

switch to com.oracle:xmlparserv2_sans_jaxp_services which is available at 11.2.0.2
deegree · Apr 30, 2015 · 63fe0b2 · 63fe0b2
1 parent 772faa9
commit 63fe0b2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/deegree-datastores/deegree-coveragestores/deegree-coveragestore-oracle-georaster/pom.xml b/deegree-datastores/deegree-coveragestores/deegree-coveragestore-oracle-georaster/pom.xml
@@ -106,7 +106,7 @@
     </dependency>
     <dependency>
       <groupId>com.oracle</groupId>
-      <artifactId>xmlparserv2</artifactId>
+      <artifactId>xmlparserv2_sans_jaxp_services</artifactId>
     </dependency>
   </dependencies>
 

diff --git a/...r/src/main/java/org/deegree/coverage/raster/io/oraclegeoraster/OracleGeorasterReader.java b/...r/src/main/java/org/deegree/coverage/raster/io/oraclegeoraster/OracleGeorasterReader.java
@@ -306,7 +306,7 @@ private void init( AbstractOracleGeorasterType.Raster raster, StorageBBox storag
         if ( envelope == null || rasterRect == null )
             throw new ResourceInitException(
                                              "GeoRaster has no Spatial and/or Size information. Please correct config or db." );
-        if ( maxLevel <= 0 ) {
+        if ( maxLevel < 0 ) {
             maxLevel = 0;
             LOG.warn( "Raster {}.{}:{} has no Pyramid, this is not recommended", rasterTable, rasterColumn, rasterId );
         }

diff --git a/pom.xml b/pom.xml
@@ -713,7 +713,7 @@
       </dependency>
       <dependency>
         <groupId>com.oracle</groupId>
-        <artifactId>xmlparserv2</artifactId>
+        <artifactId>xmlparserv2_sans_jaxp_services</artifactId>
         <version>11.2.0.2</version>
       </dependency>
       <!-- Batik -->