svn commit: r557961 - in /incubator/tuscany/java/sca/modules/implementation-java-xml/src: main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/

[antelder]

Author: antelder
Date: Fri Jul 20 03:47:57 2007
New Revision: 557961

URL: http://svn.apache.org/viewvc?view=rev&rev=557961
Log:
conversation max age and max idele time are not mutually exclusive

Modified:
    
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
    
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java

Modified: 
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java?view=diff&rev=557961&r1=557960&r2=557961
==============================================================================
--- 
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
 Fri Jul 20 03:47:57 2007
@@ -61,9 +61,6 @@
             long maxIdleTime;
             String maxAgeVal = conversation.maxAge();
             String maxIdleTimeVal = conversation.maxIdleTime();
-            if (maxAgeVal.length() > 0 && maxIdleTimeVal.length() > 0) {
-                throw new InvalidConversationalImplementation("Max idle time 
and age both specified");
-            }
             try {
                 if (maxAgeVal.length() > 0) {
                     maxAge = convertTimeMillis(maxAgeVal);

Modified: 
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java?view=diff&rev=557961&r1=557960&r2=557961
==============================================================================
--- 
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
 Fri Jul 20 03:47:57 2007
@@ -52,16 +52,6 @@
         assertEquals(-1, type.getMaxIdleTime());
     }
 
-    public void testBadFooBoth() throws Exception {
-        JavaImplementation type = 
javaImplementationFactory.createJavaImplementation();
-        try {
-            processor.visitClass(BadFooBoth.class, type);
-            fail();
-        } catch (InvalidConversationalImplementation e) {
-            // expected
-        }
-    }
-
     public void testImplicitScope() throws Exception {
         JavaImplementation type = 
javaImplementationFactory.createJavaImplementation();
         processor.visitClass(ImplicitFooScope.class, type);



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