[tapestry-5] branch master updated: TAP5-2611: Share private field instrumentations with the PlasticClassPool to support nested classes in Java 11+

[dmitrygusev]

This is an automated email from the ASF dual-hosted git repository.

dmitrygusev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git


The following commit(s) were added to refs/heads/master by this push:
     new f8f5923  TAP5-2611: Share private field instrumentations with the 
PlasticClassPool to support nested classes in Java 11+
f8f5923 is described below

commit f8f59234a0131b783a5b372ea1878b0703e342fa
Author: Dmitry Gusev <dmitry.gu...@gmail.com>
AuthorDate: Sun Jun 23 00:20:51 2019 +0300

    TAP5-2611: Share private field instrumentations with the PlasticClassPool 
to support nested classes in Java 11+
---
 .../org/apache/tapestry5/internal/plastic/PlasticClassImpl.java     | 4 ++--
 .../groovy/org/apache/tapestry5/plastic/FieldConduitTests.groovy    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java
 
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java
index 7951008..56a7f4c 100644
--- 
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java
+++ 
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java
@@ -1607,7 +1607,7 @@ public class PlasticClassImpl extends Lockable implements 
PlasticClass, Internal
 
         fieldInstrumentations.write.put(fieldName, fi);
 
-        if (!(proxy || privateField))
+        if (!proxy)
         {
             pool.setFieldWriteInstrumentation(classNode.name, fieldName, fi);
         }
@@ -1619,7 +1619,7 @@ public class PlasticClassImpl extends Lockable implements 
PlasticClass, Internal
 
         fieldInstrumentations.read.put(fieldName, fi);
 
-        if (!(proxy || privateField))
+        if (!proxy)
         {
             pool.setFieldReadInstrumentation(classNode.name, fieldName, fi);
         }
diff --git 
a/plastic/src/test/groovy/org/apache/tapestry5/plastic/FieldConduitTests.groovy 
b/plastic/src/test/groovy/org/apache/tapestry5/plastic/FieldConduitTests.groovy
index b5a2352..3cc2725 100644
--- 
a/plastic/src/test/groovy/org/apache/tapestry5/plastic/FieldConduitTests.groovy
+++ 
b/plastic/src/test/groovy/org/apache/tapestry5/plastic/FieldConduitTests.groovy
@@ -118,7 +118,7 @@ class FieldConduitTests extends AbstractPlasticSpecification
         1 * fc.get(o, _) >> "plastic"
     }
 
-    def "subclass access methods are reouted through field conduit"()
+    def "subclass access methods are routed through field conduit"()
     {
         FieldConduit fc = Mock()
 
@@ -149,7 +149,7 @@ class FieldConduitTests extends AbstractPlasticSpecification
         1* fc.get(o, _) >> "bumble"
     }
 
-    def "verify writebehind on normal field"()
+    def "verify write-behind on normal field"()
     {
         FieldConduit fc = Mock()
 
@@ -184,7 +184,7 @@ class FieldConduitTests extends AbstractPlasticSpecification
         o.m_value == 1097
     }
 
-    def "verify writebehind on wide field"()
+    def "verify write-behind on wide field"()
     {
         FieldConduit fc = Mock()