Sophie

Sophie

distrib > Mageia > 3 > i586 > media > core-release-src > by-pkgid > 14e365511e750b810494f0b35c0efae4 > files > 13

ice-3.4.2-3.mga3.src.rpm

From 54a3ab16ea3deaea6a6eb7e5d318dd497572e116 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= <hguemar@fedoraproject.org>
Date: Tue, 29 May 2012 12:38:17 +0200
Subject: [PATCH 7/9] java 7 fix

---
 java/src/IceInternal/OutgoingConnectionFactory.java |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/src/IceInternal/OutgoingConnectionFactory.java b/java/src/IceInternal/OutgoingConnectionFactory.java
index 2036c08..c4bc58f 100644
--- a/java/src/IceInternal/OutgoingConnectionFactory.java
+++ b/java/src/IceInternal/OutgoingConnectionFactory.java
@@ -17,7 +17,7 @@ public final class OutgoingConnectionFactory
     private static class MultiHashMap<K, V> extends java.util.HashMap<K, java.util.List<V>>
     {
         public void
-        put(K key, V value)
+        put_(K key, V value)
         {
             java.util.List<V> list = this.get(key);
             if(list == null)
@@ -693,9 +693,9 @@ public final class OutgoingConnectionFactory
             throw ex;
 	}
 
-        _connections.put(ci.connector, connection);
-        _connectionsByEndpoint.put(connection.endpoint(), connection);
-        _connectionsByEndpoint.put(connection.endpoint().compress(true), connection);
+        _connections.put_(ci.connector, connection);
+        _connectionsByEndpoint.put_(connection.endpoint(), connection);
+        _connectionsByEndpoint.put_(connection.endpoint().compress(true), connection);
         return connection;
     }
 
-- 
1.7.10.2