From cb095132b14eb61e1dfed8079a459633ea18a256 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Tue, 28 Oct 2014 13:23:55 +0100
Subject: [PATCH] Defensive String equals comparison in ClassReader

Issue: SPR-12382
---
 .../src/main/java/org/springframework/asm/ClassReader.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-core/src/main/java/org/springframework/asm/ClassReader.java b/spring-core/src/main/java/org/springframework/asm/ClassReader.java
index b34da6bb9e..3aaf95a4c3 100644
--- a/spring-core/src/main/java/org/springframework/asm/ClassReader.java
+++ b/spring-core/src/main/java/org/springframework/asm/ClassReader.java
@@ -928,7 +928,8 @@ public class ClassReader {
          */
         if (WRITER && mv instanceof MethodWriter) {
             MethodWriter mw = (MethodWriter) mv;
-            if (mw.cw.cr == this && signature == mw.signature) {
+            if (mw.cw.cr == this &&
+					(signature != null ? signature.equals(mw.signature) : mw.signature == null)) {
                 boolean sameExceptions = false;
                 if (exceptions == null) {
                     sameExceptions = mw.exceptionCount == 0;