[Yanel-commits] rev 26034 -
public/yanel/trunk/src/resources/xml/src/java/org/wyona/yanel/impl/resources
michi at wyona.com
michi at wyona.com
Tue Jul 17 11:07:37 CEST 2007
Author: michi
Date: 2007-07-17 11:07:37 +0200 (Tue, 17 Jul 2007)
New Revision: 26034
Modified:
public/yanel/trunk/src/resources/xml/src/java/org/wyona/yanel/impl/resources/XMLResource.java
Log:
NPE fixed
Modified: public/yanel/trunk/src/resources/xml/src/java/org/wyona/yanel/impl/resources/XMLResource.java
===================================================================
--- public/yanel/trunk/src/resources/xml/src/java/org/wyona/yanel/impl/resources/XMLResource.java 2007-07-17 08:59:41 UTC (rev 26033)
+++ public/yanel/trunk/src/resources/xml/src/java/org/wyona/yanel/impl/resources/XMLResource.java 2007-07-17 09:07:37 UTC (rev 26034)
@@ -175,7 +175,8 @@
xsltHandlers[i].getTransformer().setParameter("content-language", getContentLanguage());
// Username
- xsltHandlers[i].getTransformer().setParameter("username", getUsername());
+ String username = getUsername();
+ if (username != null) xsltHandlers[i].getTransformer().setParameter("username", username);
}
// create i18n transformer:
@@ -704,7 +705,8 @@
private String getUsername() {
IdentityMap im = (IdentityMap) getRequest().getSession(true).getAttribute(IDENTITY_MAP_KEY);
if (im != null) {
- return ((Identity)im.get(getRealm().getID())).getUsername();
+ Identity identity = (Identity)im.get(getRealm().getID());
+ if (identity != null) return identity.getUsername();
}
return null;
}
More information about the Yanel-commits
mailing list