X-Git-Url: http://git.rot13.org/?p=zxing.git;a=blobdiff_plain;f=zxingorg%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Fweb%2FDecodeServlet.java;fp=zxingorg%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Fweb%2FDecodeServlet.java;h=3926f0f8cbf4e7eeaea917406cd3090cbd41ab08;hp=adeedd809485189d6f73ae11dd848475e7ae477c;hb=ac343e4ddc7af1f54c2d2634abb1be992d183a35;hpb=112aa0eb1c6b40b46c58f9133443fa1aa20e49fb

diff --git a/zxingorg/src/com/google/zxing/web/DecodeServlet.java b/zxingorg/src/com/google/zxing/web/DecodeServlet.java
index adeedd80..3926f0f8 100644
--- a/zxingorg/src/com/google/zxing/web/DecodeServlet.java
+++ b/zxingorg/src/com/google/zxing/web/DecodeServlet.java
@@ -18,9 +18,12 @@ package com.google.zxing.web;
 
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.BinaryBitmap;
+import com.google.zxing.ChecksumException;
 import com.google.zxing.DecodeHintType;
+import com.google.zxing.FormatException;
 import com.google.zxing.LuminanceSource;
 import com.google.zxing.MultiFormatReader;
+import com.google.zxing.NotFoundException;
 import com.google.zxing.Reader;
 import com.google.zxing.ReaderException;
 import com.google.zxing.Result;
@@ -85,7 +88,7 @@ import javax.servlet.http.HttpServletResponse;
  */
 public final class DecodeServlet extends HttpServlet {
 
-  private static final long MAX_IMAGE_SIZE = 500000L;
+  private static final long MAX_IMAGE_SIZE = 2000000L;
 
   private static final Logger log = Logger.getLogger(DecodeServlet.class.getName());
 
@@ -260,10 +263,18 @@ public final class DecodeServlet extends HttpServlet {
         LuminanceSource source = new BufferedImageLuminanceSource(image);
         BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
         result = reader.decode(bitmap, HINTS);
-      } catch (ReaderException re2) {
-        log.info("DECODE FAILED: " + re.toString());
+      } catch (NotFoundException nfe) {
+        log.info("Not found: " + re.toString());
         response.sendRedirect("notfound.jspx");
         return;
+      } catch (FormatException fe) {
+        log.info("Format problem: " + re.toString());
+        response.sendRedirect("format.jspx");
+        return;
+      } catch (ChecksumException ce) {
+        log.info("Checksum problem: " + re.toString());
+        response.sendRedirect("format.jspx");
+        return;
       }
     }