svn commit: r1789136 - in /felix/trunk/gogo/runtime/src: main/java/org/apache/felix/gogo/runtime/Closure.java test/java/org/apache/felix/gogo/runtime/ClosureTest.java

[gn...@apache.org]

Author: gnodet
Date: Tue Mar 28 13:34:08 2017
New Revision: 1789136

URL: http://svn.apache.org/viewvc?rev=1789136&view=rev
Log:
[FELIX-5599] Allow reusing a closure from a parent session

Added:
    felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/ClosureTest.java
Modified:
    felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java

Modified: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java?rev=1789136&r1=1789135&r2=1789136&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java Tue Mar 28 13:34:08 2017
@@ -150,6 +150,17 @@ public class Closure implements Function
 
     public Object execute(CommandSession x, List<Object> values, Channel capturingOutput) throws Exception
     {
+        if (x != null && x != session)
+        {
+            if (x instanceof CommandSessionImpl)
+            {
+                return new Closure((CommandSessionImpl) x, null, program).execute(x, values, capturingOutput);
+            }
+            else
+            {
+                throw new IllegalStateException("The current session is not a Gogo session");
+            }
+        }
         try
         {
             location.remove();

Added: felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/ClosureTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/ClosureTest.java?rev=1789136&view=auto
==============================================================================
--- felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/ClosureTest.java (added)
+++ felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/ClosureTest.java Tue Mar 28 13:34:08 2017
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.felix.gogo.runtime;
+
+import org.junit.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.Collections;
+
+import static org.junit.Assert.assertEquals;
+
+public class ClosureTest {
+
+    @Test
+    public void testParentSessionClosure() throws Exception {
+        CommandProcessorImpl processor = new CommandProcessorImpl(null);
+        ByteArrayInputStream bais = new ByteArrayInputStream("".getBytes());
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        CommandSessionImpl parent = processor.createSession(bais, baos, baos);
+        parent.execute("var = a");
+        parent.execute("cmd = { $var }");
+        CommandSessionImpl child = processor.createSession(parent);
+        child.execute("var = b");
+        assertEquals("a", ((Closure) parent.get("cmd")).execute(parent, Collections.emptyList()).toString());
+        assertEquals("b", ((Closure) parent.get("cmd")).execute(child, Collections.emptyList()).toString());
+    }
+}