Changeset 403

Timestamp:

09/29/08 20:49:00 (3 months ago)

Author:

arneke

Message:

Throw more exceptions, for invalid resolutions and output formats

Location:

trunk/geowebcache/src/main/java/org/geowebcache

Files:

• layer/GridCalculator.java (modified) (3 diffs)
• mime/MimeType.java (modified) (1 diff)

trunk/geowebcache/src/main/java/org/geowebcache/layer/GridCalculator.java

@@ -16 +16 @@
  */
 package org.geowebcache.layer;
+
+import java.util.Arrays;
 
 import org.apache.commons.logging.Log;
@@ -467 +469 @@
         //low = 0;
         //high = resolutions.length - 1;
-        
-        while (low <= high) {
+
+        // Lets be generous and not calculate log
+        int maxCount = resolutions.length / 2;
+        
+        while (low <= high && maxCount > 0) {
+                maxCount--;
             int mid = (low + high) >>> 1;
             
@@ -484 +490 @@
             }
         }
-        throw new BadTileException("Oops. Should never get here.");
+        throw new BadTileException("The bounds resulted in a resolution of " 
+                        + reqResolution + " which does not match any of the available ones "
+                        + Arrays.toString(resolutions));
     }
     

trunk/geowebcache/src/main/java/org/geowebcache/mime/MimeType.java

@@ -114 +114 @@
         }
 
-        log.debug("Unsupported format request: " + formatStr + ", returning null");
-        return null;
+        throw new MimeException("Unsupported format request: " + formatStr);
     }