From 162945d2a91899b637bbb9e163b406350de12906 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 Oct 2021 19:43:03 +0100 Subject: gentoo resync : 30.10.2021 --- dev-java/avalon-framework/files/4.2.0-enum.patch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 dev-java/avalon-framework/files/4.2.0-enum.patch (limited to 'dev-java/avalon-framework/files/4.2.0-enum.patch') diff --git a/dev-java/avalon-framework/files/4.2.0-enum.patch b/dev-java/avalon-framework/files/4.2.0-enum.patch new file mode 100644 index 000000000000..d4f4d2fcf692 --- /dev/null +++ b/dev-java/avalon-framework/files/4.2.0-enum.patch @@ -0,0 +1,23 @@ +diff --git a/api/src/java/org/apache/avalon/framework/.Enum.java.swp b/api/src/java/org/apache/avalon/framework/.Enum.java.swp +deleted file mode 100644 +index 1eb30e7..0000000 +Binary files a/api/src/java/org/apache/avalon/framework/.Enum.java.swp and /dev/null differ +diff --git a/api/src/java/org/apache/avalon/framework/Enum.java b/api/src/java/org/apache/avalon/framework/Enum.java +index 6ceba68..37c2aec 100644 +--- a/api/src/java/org/apache/avalon/framework/Enum.java ++++ b/api/src/java/org/apache/avalon/framework/Enum.java +@@ -126,11 +126,11 @@ public abstract class Enum + if( !(o instanceof Enum) ) + return false; + +- final Enum enum = (Enum)o; ++ final Enum enum_ = (Enum)o; + +- if( !getClass().equals( enum.getClass() ) ) ++ if( !getClass().equals( enum_.getClass() ) ) + return false; +- if( m_name != null ? !m_name.equals( enum.m_name ) : enum.m_name != null ) ++ if( m_name != null ? !m_name.equals( enum_.m_name ) : enum_.m_name != null ) + return false; + + return true; -- cgit v1.2.3