From 99e41ef79d97c58202b5aa31d8fad999825d59fc Mon Sep 17 00:00:00 2001
From: "srowen@gmail.com"
 <srowen@gmail.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Fri, 26 Apr 2013 17:42:22 +0000
Subject: [PATCH] Fix an NPE that comes up in full testing from last commit

git-svn-id: https://zxing.googlecode.com/svn/trunk@2695 59b500cc-1b3d-0410-9834-0bbf25fbcc57
---
 .../google/zxing/pdf417/decoder/PDF417ScanningDecoder.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/com/google/zxing/pdf417/decoder/PDF417ScanningDecoder.java b/core/src/com/google/zxing/pdf417/decoder/PDF417ScanningDecoder.java
index be6e44f30..862708304 100644
--- a/core/src/com/google/zxing/pdf417/decoder/PDF417ScanningDecoder.java
+++ b/core/src/com/google/zxing/pdf417/decoder/PDF417ScanningDecoder.java
@@ -187,10 +187,10 @@ public final class PDF417ScanningDecoder {
   private static BarcodeMetadata getBarcodeMetadata(DetectionResultRowIndicatorColumn leftRowIndicatorColumn,
                                                     DetectionResultRowIndicatorColumn rightRowIndicatorColumn) {
     if (leftRowIndicatorColumn == null || leftRowIndicatorColumn.getBarcodeMetadata() == null) {
-      return rightRowIndicatorColumn.getBarcodeMetadata();
+      return rightRowIndicatorColumn == null ? null : rightRowIndicatorColumn.getBarcodeMetadata();
     }
     if (rightRowIndicatorColumn == null || rightRowIndicatorColumn.getBarcodeMetadata() == null) {
-      return leftRowIndicatorColumn.getBarcodeMetadata();
+      return leftRowIndicatorColumn == null ? null : leftRowIndicatorColumn.getBarcodeMetadata();
     }
     BarcodeMetadata leftBarcodeMetadata = leftRowIndicatorColumn.getBarcodeMetadata();
     BarcodeMetadata rightBarcodeMetadata = rightRowIndicatorColumn.getBarcodeMetadata();