From 7fe2c1c60cf7e98083c57558ef5de0a373eddf29 Mon Sep 17 00:00:00 2001
From: dswitkin <dswitkin@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Thu, 9 Oct 2008 18:46:21 +0000
Subject: [PATCH] Prevented ISBN parsing from happening twice.

git-svn-id: https://zxing.googlecode.com/svn/trunk@610 59b500cc-1b3d-0410-9834-0bbf25fbcc57
---
 core/src/com/google/zxing/client/result/ResultParser.java    | 1 +
 core/src/com/google/zxing/client/result/UPCResultParser.java | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/src/com/google/zxing/client/result/ResultParser.java b/core/src/com/google/zxing/client/result/ResultParser.java
index 4aa5431e2..d74dfc435 100644
--- a/core/src/com/google/zxing/client/result/ResultParser.java
+++ b/core/src/com/google/zxing/client/result/ResultParser.java
@@ -66,6 +66,7 @@ public abstract class ResultParser {
     } else if ((result = URIResultParser.parse(theResult)) != null) {
       return result;
     } else if ((result = ISBNResultParser.parse(theResult)) != null) {
+      // We depend on ISBN parsing coming before UPC, as it is a subset.
       return result;
     } else if ((result = UPCResultParser.parse(theResult)) != null) {
       return result;
diff --git a/core/src/com/google/zxing/client/result/UPCResultParser.java b/core/src/com/google/zxing/client/result/UPCResultParser.java
index b2ab387c1..331d57b3d 100644
--- a/core/src/com/google/zxing/client/result/UPCResultParser.java
+++ b/core/src/com/google/zxing/client/result/UPCResultParser.java
@@ -36,9 +36,6 @@ final class UPCResultParser extends ResultParser {
         !BarcodeFormat.EAN_8.equals(format) && !BarcodeFormat.EAN_13.equals(format)) {
       return null;
     }
-    if (ISBNResultParser.parse(result) != null) {
-      return null;
-    }
     String rawText = result.getText();
     if (rawText == null) {
       return null;