Author: hlship
Date: Sat Nov 12 10:26:21 2005
New Revision: 332812
URL: http://svn.apache.org/viewcvs?rev=332812&view=rev
Log:
TAPESTRY-719: If an engine service returns null from getName(), an NPE occurs
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ServiceMapImpl.java
jakarta/tapestry/trunk/status.xml
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ServiceMapImpl.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ServiceMapImpl.java?rev=332812&r1=332811&r2=332812&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ServiceMapImpl.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ServiceMapImpl.java
Sat Nov 12 10:26:21 2005
@@ -128,7 +128,7 @@
IEngineService service = contribution.getService();
String serviceName = service.getName();
- if (!serviceName.equals(name))
+ if (!name.equals(serviceName))
throw new
ApplicationRuntimeException(ImplMessages.serviceNameMismatch(
service,
name,
Modified: jakarta/tapestry/trunk/status.xml
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/status.xml?rev=332812&r1=332811&r2=332812&view=diff
==============================================================================
--- jakarta/tapestry/trunk/status.xml (original)
+++ jakarta/tapestry/trunk/status.xml Sat Nov 12 10:26:21 2005
@@ -66,6 +66,7 @@
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-652">Checkbox does not
support FieldLabel</action>
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-328">When an engine
implementation is missing Tapestry does not throw an appropriate error</action>
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-720">Tapestry should
validate that all engine services provide a non-null service parameter</action>
+ <action type="fix" dev="HLS" fixes-bug="TAPESTRY-719">If an engine
service returns null from getName(), an NPE occurs</action>
</release>
<release version="4.0-beta-12" date="Oct 30 2005">
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-718">Asset injection
makes assets appear as null inside finishLoad()</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
