commit 7618e1636c74b1e9e9f0defa769f4fca57315e14
author Ben Gruver <bgruv@google.com> Sat Sep 28 17:57:33 2013 -0700
committer Ben Gruver <bgruv@google.com> Sat Sep 28 17:57:33 2013 -0700
tree af99ec802bbd062a0d043ce75b8f6d020791dc6f
parent 44c5c07c5724e9448d803b3585c9ef47117c3d4e

Make extra sure we don't output blank debug items

dexlib2/src/main/java/org/jf/dexlib2/writer/DexWriter.java

diff --git a/dexlib2/src/main/java/org/jf/dexlib2/writer/DexWriter.java b/dexlib2/src/main/java/org/jf/dexlib2/writer/DexWriter.java
index bdd6dbf..6d09a5a 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/writer/DexWriter.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/writer/DexWriter.java
@@ -31,10 +31,7 @@
 
 package org.jf.dexlib2.writer;
 
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Ordering;
+import com.google.common.collect.*;
 import org.jf.dexlib2.AccessFlags;
 import org.jf.dexlib2.Opcode;
 import org.jf.dexlib2.ReferenceType;
@@ -811,7 +808,8 @@
             }
         }
 
-        if (debugItems == null && parameterCount == 0) {
+
+        if (parameterCount == 0 && (debugItems == null || Iterables.isEmpty(debugItems))) {
             return NO_OFFSET;
         }