[tapestry-5] branch 5.4.x updated: TAP5-2582: Service creation for Hibernate Session results in

[thiagohp]

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

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


The following commit(s) were added to refs/heads/5.4.x by this push:
     new 9cb8278  TAP5-2582: Service creation for Hibernate Session results in
9cb8278 is described below

commit 9cb827808449f3c90ef6da14090bf83c68429444
Author: Thiago H. de Paula Figueiredo <thi...@arsmachina.com.br>
AuthorDate: Sun Feb 24 11:49:29 2019 -0300

    TAP5-2582: Service creation for Hibernate Session results in
    
    ClassFormatError: Duplicate method name&signature
    # Conflicts:
    #   
plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java
---
 .../java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 a7c1fc5..695a3ae 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
@@ -1434,7 +1434,7 @@ public class PlasticClassImpl extends Lockable implements 
PlasticClass, Internal
         addClassAnnotations(interfaceClassNode);
 
         Set<PlasticMethod> introducedMethods = new HashSet<PlasticMethod>();
-        Set<Method> alreadyIntroducedMethods = new HashSet<>();
+        Set<Method> alreadyIntroducedMethods = new HashSet<Method>();
 
         Method[] sortedMethods = interfaceType.getMethods();
         Arrays.sort(sortedMethods, METHOD_COMPARATOR);