Support @EndsConversation methods in non @Conversational annotated interfaces.

tinfi/RELEASE_NOTES.txt

 Tinfi 1.3.2
 -----------
+* support @EndsConversation methods in non @Conversational annotated interfaces
 * fix proxy generation for generic methods to enable compilation with javac
 
 

tinfi/examples/advanced/tests-conf/src/test/java/org/ow2/frascati/tinfi/ScopeTestCase.java

@@ -292,6 +292,7 @@ public class ScopeTestCase {
     /**
      * @since 1.3.2
      */
+    @Test
     public void testScopeConversationCallback()
     throws
     	ClassNotFoundException, InstantiationException, IllegalAccessException,

tinfi/opt/oo/src/main/java/org/ow2/frascati/tinfi/opt/oo/CallableReferenceClassGenerator.java

@@ -151,10 +151,13 @@ extends AbstractProxyClassGenerator {
             	 * example for callback interfaces associated with conversation
             	 * scoped components.
             	 */
-                mv.visitln("    "+ConversationImpl.class.getName()+" conv = getConversation();");
+                mv.visitln("    "+ConversationImpl.class.getName()+" conv = peekConversation();");
             }
             mv.visitln("      conv.end();");
-            mv.visitln("      popConversation();");
+        }
+        if( conversationalItf != null ) {
+            mv.visitln("    conv.access();");
+            mv.visitln("    popConversation();");
         }
     }
 

tinfi/opt/oo/src/main/java/org/ow2/frascati/tinfi/opt/oo/ServiceReferenceClassGenerator.java

@@ -249,7 +249,7 @@ extends AbstractProxyClassGenerator {
             	 * example for callback interfaces associated with conversation
             	 * scoped components.
             	 */
-                mv.visitln("    "+ConversationImpl.class.getName()+" conv = getConversation();");
+                mv.visitln("    "+ConversationImpl.class.getName()+" conv = peekConversation();");
             }
             mv.visitln("    conv.end();");
         }