some bug fixes

git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@1032 379699f6-c40d-0410-875b-85095c16579e
branch_1_1
jochen 26 years ago
parent e0f4124830
commit 81cac56337
  1. 8
      jode/jode/flow/TransformExceptionHandlers.java

@ -77,6 +77,12 @@ public class TransformExceptionHandlers {
/* ...Last sort by typecode signature. Shouldn't happen to often. /* ...Last sort by typecode signature. Shouldn't happen to often.
*/ */
if (type == second.type)
return 0;
if (type == null)
return -1;
if (second.type == null)
return 1;
return type.getTypeSignature() return type.getTypeSignature()
.compareTo(second.type.getTypeSignature()); .compareTo(second.type.getTypeSignature());
} }
@ -845,7 +851,7 @@ public class TransformExceptionHandlers {
FlowBlock catchFlow = exc.handler; FlowBlock catchFlow = exc.handler;
boolean isMultiUsed = catchFlow.predecessors.size() != 0; boolean isMultiUsed = catchFlow.predecessors.size() != 0;
if (!isMultiUsed) { if (!isMultiUsed && next != null) {
for (Iterator j = handlers.tailSet(next).iterator(); for (Iterator j = handlers.tailSet(next).iterator();
j.hasNext();) { j.hasNext();) {
Handler h = (Handler) j.next(); Handler h = (Handler) j.next();

Loading…
Cancel
Save