You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2008/01/08 10:47:30 UTC
svn commit: r609916 -
/incubator/sling/trunk/launcher/app/src/main/java/org/apache/sling/launcher/app/Sling.java
Author: bdelacretaz
Date: Tue Jan 8 01:47:29 2008
New Revision: 609916
URL: http://svn.apache.org/viewvc?rev=609916&view=rev
Log:
don't fail on null osgiProp value in Sling.resolve(...)
Modified:
incubator/sling/trunk/launcher/app/src/main/java/org/apache/sling/launcher/app/Sling.java
Modified: incubator/sling/trunk/launcher/app/src/main/java/org/apache/sling/launcher/app/Sling.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launcher/app/src/main/java/org/apache/sling/launcher/app/Sling.java?rev=609916&r1=609915&r2=609916&view=diff
==============================================================================
--- incubator/sling/trunk/launcher/app/src/main/java/org/apache/sling/launcher/app/Sling.java (original)
+++ incubator/sling/trunk/launcher/app/src/main/java/org/apache/sling/launcher/app/Sling.java Tue Jan 8 01:47:29 2008
@@ -513,10 +513,7 @@
private void resolve(Map<String, String> props, String osgiProp,
String prefix) throws BundleException {
final String propVal = props.get(osgiProp);
- if(propVal == null) {
- throw new BundleException(osgiProp + " property is null, Sling.resolve() fails");
- }
- StringBuffer prop = new StringBuffer(propVal);
+ StringBuffer prop = new StringBuffer(propVal == null ? "" : propVal);
boolean mod = false;
for (Entry<String, String> pEntry : props.entrySet()) {
String key = pEntry.getKey();