From 681a4e5c11e4eba217c2a68f33ebc309bcf64a95 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Tue, 13 Jan 2009 17:38:10 +0000
Subject: [PATCH] 260384: NumberFormatException

---
 .../aspectj/asm/internal/JDTLikeHandleProvider.java    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/asm/src/org/aspectj/asm/internal/JDTLikeHandleProvider.java b/asm/src/org/aspectj/asm/internal/JDTLikeHandleProvider.java
index d212926bb..fb825fade 100644
--- a/asm/src/org/aspectj/asm/internal/JDTLikeHandleProvider.java
+++ b/asm/src/org/aspectj/asm/internal/JDTLikeHandleProvider.java
@@ -202,8 +202,9 @@ public class JDTLikeHandleProvider implements IElementHandleProvider {
 					if (object.getKind() == ipe.getKind()) {
 						if (object.getName().endsWith("{..}")) {
 							String existingHandle = object.getHandleIdentifier();
-							int suffixPosition = existingHandle.indexOf('!');
-							if (suffixPosition != -1) {
+							int suffixPosition = existingHandle.lastIndexOf('!');
+							int lastSquareBracket = existingHandle.lastIndexOf('['); // type delimiter
+							if (suffixPosition != -1 && lastSquareBracket<suffixPosition) { // pr260384
 								count = new Integer(existingHandle.substring(suffixPosition + 1)).intValue() + 1;
 							} else {
 								if (count == 1) {
@@ -222,8 +223,9 @@ public class JDTLikeHandleProvider implements IElementHandleProvider {
 					if (object.getKind() == ipe.getKind()) {
 						if (object.getName().equals(ipe.getName())) {
 							String existingHandle = object.getHandleIdentifier();
-							int suffixPosition = existingHandle.indexOf('!');
-							if (suffixPosition != -1) {
+							int suffixPosition = existingHandle.lastIndexOf('!');
+							int lastSquareBracket = existingHandle.lastIndexOf('['); // type delimiter
+							if (suffixPosition != -1 && lastSquareBracket<suffixPosition) { // pr260384
 								count = new Integer(existingHandle.substring(suffixPosition + 1)).intValue() + 1;
 							} else {
 								if (count == 1) {
-- 
2.39.5