diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java index 0b19c629b82..d98614fa70a 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java @@ -92,7 +92,7 @@ import org.springframework.util.StringValueResolver; * @see PropertyOverrideConfigurer */ public class PropertyPlaceholderConfigurer extends PropertyResourceConfigurer - implements BeanNameAware, BeanFactoryAware { + implements BeanNameAware, BeanFactoryAware { /** Default placeholder prefix: "${" */ public static final String DEFAULT_PLACEHOLDER_PREFIX = "${"; diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/ClassPathResource.java b/org.springframework.core/src/main/java/org/springframework/core/io/ClassPathResource.java index 53c42483080..c63afc0feb6 100644 --- a/org.springframework.core/src/main/java/org/springframework/core/io/ClassPathResource.java +++ b/org.springframework.core/src/main/java/org/springframework/core/io/ClassPathResource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2009 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. @@ -132,7 +132,7 @@ public class ClassPathResource extends AbstractResource { * @see java.lang.Class#getResourceAsStream(String) */ public InputStream getInputStream() throws IOException { - InputStream is = null; + InputStream is; if (this.clazz != null) { is = this.clazz.getResourceAsStream(this.path); } @@ -153,7 +153,7 @@ public class ClassPathResource extends AbstractResource { */ @Override public URL getURL() throws IOException { - URL url = null; + URL url; if (this.clazz != null) { url = this.clazz.getResource(this.path); }