svn commit: r369939 - /struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockApplication.java

[craigmcc]

Author: craigmcc
Date: Tue Jan 17 13:54:58 2006
New Revision: 369939

URL: http://svn.apache.org/viewcvs?rev=369939&view=rev
Log:
Make the createConverter() methods return null (per spec) if no matching
registered converter can be found.

Modified:
    
struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockApplication.java

Modified: 
struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockApplication.java
URL: 
http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockApplication.java?rev=369939&r1=369938&r2=369939&view=diff
==============================================================================
--- 
struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockApplication.java
 (original)
+++ 
struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockApplication.java
 Tue Jan 17 13:54:58 2006
@@ -100,6 +100,7 @@
         addConverter(Long.TYPE,                
"javax.faces.convert.LongConverter");
         addConverter(Short.class,              
"javax.faces.convert.ShortConverter");
         addConverter(Short.TYPE,               
"javax.faces.convert.ShortConverter");
+
     }
 
 
@@ -316,6 +317,9 @@
     public Converter createConverter(String converterId) {
 
         String converterClass = (String) converters.get(converterId);
+        if (converterClass == null) {
+            return null;
+        }
         try {
             Class clazz = Class.forName(converterClass);
             return ((Converter) clazz.newInstance());
@@ -329,6 +333,9 @@
     public Converter createConverter(Class targetClass) {
 
         String converterClass = (String) converters1.get(targetClass);
+        if (converterClass == null) {
+            return null;
+        }
         try {
             Class clazz = Class.forName(converterClass);
             return ((Converter) clazz.newInstance());



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]