From 4a6101a697475b6f0f5b5da7cf280ad372725ebb Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Sat, 21 May 2011 01:39:50 +0000
Subject: [PATCH] Guard against null in #visitInnerClass

Issue: SPR-8358,SPR-8186
---
 .../core/type/classreading/ClassMetadataReadingVisitor.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/org.springframework.core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java b/org.springframework.core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java
index 4e21320fbd0..d69a75bb3d1 100644
--- a/org.springframework.core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java
+++ b/org.springframework.core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java
@@ -80,9 +80,9 @@ class ClassMetadataReadingVisitor implements ClassVisitor, ClassMetadata {
 	}
 
 	public void visitInnerClass(String name, String outerName, String innerName, int access) {
-		String fqName = ClassUtils.convertResourcePathToClassName(name);
-		String fqOuterName = ClassUtils.convertResourcePathToClassName(outerName);
 		if (outerName != null) {
+			String fqName = ClassUtils.convertResourcePathToClassName(name);
+			String fqOuterName = ClassUtils.convertResourcePathToClassName(outerName);
 			if (this.className.equals(fqName)) {
 				this.enclosingClassName = fqOuterName;
 				this.independentInnerClass = ((access & Opcodes.ACC_STATIC) != 0);