You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2015/04/07 08:44:58 UTC
svn commit: r1671746 - in /sling/trunk/contrib/extensions/i18n/src:
main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
test/java/org/apache/sling/i18n/impl/JcrResourceBundleTest.java
Author: cziegeler
Date: Tue Apr 7 06:44:57 2015
New Revision: 1671746
URL: http://svn.apache.org/r1671746
Log:
SLING-4580 : Remove extra null check for metadata
Modified:
sling/trunk/contrib/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
sling/trunk/contrib/extensions/i18n/src/test/java/org/apache/sling/i18n/impl/JcrResourceBundleTest.java
Modified: sling/trunk/contrib/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java?rev=1671746&r1=1671745&r2=1671746&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java (original)
+++ sling/trunk/contrib/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java Tue Apr 7 06:44:57 2015
@@ -32,6 +32,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.ResourceBundle;
import java.util.Set;
+
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.util.TraversingItemVisitor;
@@ -258,14 +259,12 @@ public class JcrResourceBundle extends R
public void value(double value) throws IOException {}
});
- InputStream stream = resource.adaptTo(InputStream.class);
+ final InputStream stream = resource.adaptTo(InputStream.class);
if (stream != null) {
String encoding = "utf-8";
- ResourceMetadata metadata = resource.getResourceMetadata();
- if (metadata != null) { // test does not implement metadata
- if (metadata.getCharacterEncoding() != null) {
- encoding = metadata.getCharacterEncoding();
- }
+ final ResourceMetadata metadata = resource.getResourceMetadata();
+ if (metadata.getCharacterEncoding() != null) {
+ encoding = metadata.getCharacterEncoding();
}
try {
Modified: sling/trunk/contrib/extensions/i18n/src/test/java/org/apache/sling/i18n/impl/JcrResourceBundleTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/i18n/src/test/java/org/apache/sling/i18n/impl/JcrResourceBundleTest.java?rev=1671746&r1=1671745&r2=1671746&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/i18n/src/test/java/org/apache/sling/i18n/impl/JcrResourceBundleTest.java (original)
+++ sling/trunk/contrib/extensions/i18n/src/test/java/org/apache/sling/i18n/impl/JcrResourceBundleTest.java Tue Apr 7 06:44:57 2015
@@ -652,8 +652,7 @@ public class JcrResourceBundleTest exten
@Override
public ResourceMetadata getResourceMetadata() {
- // TODO Auto-generated method stub
- return null;
+ return new ResourceMetadata();
}
@Override