You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by em...@apache.org on 2022/02/04 16:11:49 UTC

[groovy] branch GROOVY_3_0_X updated: GROOVY-10458: context for pop

This is an automated email from the ASF dual-hosted git repository.

emilles pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/GROOVY_3_0_X by this push:
     new 3ef500d  GROOVY-10458: context for pop
3ef500d is described below

commit 3ef500d0f0cdb8bd97fc342a2ba42a1e52e0c5fd
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Fri Feb 4 09:55:44 2022 -0600

    GROOVY-10458: context for pop
    
    Conflicts:
    	src/main/java/org/codehaus/groovy/classgen/asm/OperandStack.java
---
 src/main/java/org/codehaus/groovy/classgen/asm/OperandStack.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/OperandStack.java b/src/main/java/org/codehaus/groovy/classgen/asm/OperandStack.java
index 5dc3743..f83c6e9 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/OperandStack.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/OperandStack.java
@@ -108,7 +108,7 @@ public class OperandStack {
     private ClassNode popWithMessage(int last) {
         try {
             return stack.remove(last);
-        } catch (ArrayIndexOutOfBoundsException ai) {
+        } catch (IndexOutOfBoundsException e) { // GROOVY-10458
             String method = controller.getMethodNode() == null ?
                     controller.getConstructorNode().getTypeDescriptor() :
                     controller.getMethodNode().getTypeDescriptor();