diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java
index 4b296177b9..d184aa9b00 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -232,7 +232,7 @@ public class AnnotationConfigUtils {
 		}
 		if (abd instanceof AbstractBeanDefinition) {
 			if (metadata.isAnnotated(Role.class.getName())) {
-				int role = attributesFor(metadata, Role.class).getNumber("value");
+				Integer role = attributesFor(metadata, Role.class).getNumber("value");
 				((AbstractBeanDefinition)abd).setRole(role);
 			}
 		}
diff --git a/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java b/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java
index 97e498bfbd..86c0043d40 100644
--- a/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java
+++ b/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java
@@ -16,6 +16,7 @@
 
 package org.springframework.core.io;
 
+import static org.hamcrest.CoreMatchers.nullValue;
 import static org.junit.Assert.*;
 
 import java.io.ByteArrayInputStream;
@@ -215,13 +216,8 @@ public class ResourceTests {
 		catch (FileNotFoundException ex) {
 			assertTrue(ex.getMessage().indexOf(name) != -1);
 		}
-		try {
-			resource.getFilename();
-			fail("IllegalStateException should have been thrown");
-		}
-		catch (IllegalStateException ex) {
-			assertTrue(ex.getMessage().indexOf(name) != -1);
-		}
+
+		assertThat(resource.getFilename(), nullValue());
 	}
 
 }