[asterisk-scf-commits] asterisk-scf/release/ice.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  b270b5a4eabc5e0479187f5424ba99a9a0c75c5a (commit)
       via  5c98b7fa77d742917f8a17c58b7c204c058e5b18 (commit)
       via  a37724d0e65069ae4a5bae3cd814aa55e89bee2f (commit)
       via  d791a3913bc966e2736a8f13172630bf4bc2b6a4 (commit)
       via  e014d30299d962a003539430462581e7b462adae (commit)
       via  ff4e5b38363534e002c6c58134612b0653d38c7b (commit)
      from  4f1cf68fa817cf7d31e5d04f7431b3c6b39ef2e6 (commit)

Summary of changes:
 cpp/src/Freeze/MapI.cpp                            |    6 +++---
 .../src/IceInternal/OutgoingConnectionFactory.java |    8 ++++----
 java/src/IceInternal/Util.java                     |   12 +++++++++++-
 3 files changed, 18 insertions(+), 8 deletions(-)


- Log -----------------------------------------------------------------
commit b270b5a4eabc5e0479187f5424ba99a9a0c75c5a
Merge: 5c98b7f ff4e5b3
Author: David M. Lee <dlee at digium.com>
Date:   Tue Nov 8 11:21:23 2011 -0600

    Merge remote-tracking branch 'integration/java-windows-fix-props-load'


commit 5c98b7fa77d742917f8a17c58b7c204c058e5b18
Merge: a37724d d791a39
Author: David M. Lee <dlee at digium.com>
Date:   Tue Nov 8 11:21:14 2011 -0600

    Merge remote-tracking branch 'integration/jdk-7'


commit a37724d0e65069ae4a5bae3cd814aa55e89bee2f
Merge: 4f1cf68 e014d30
Author: David M. Lee <dlee at digium.com>
Date:   Tue Nov 8 11:21:10 2011 -0600

    Merge remote-tracking branch 'integration/fix-libdb-5'


commit d791a3913bc966e2736a8f13172630bf4bc2b6a4
Author: David M. Lee <dlee at digium.com>
Date:   Thu Oct 20 10:57:16 2011 -0500

    Fix for JDK-7

diff --git a/java/src/IceInternal/OutgoingConnectionFactory.java b/java/src/IceInternal/OutgoingConnectionFactory.java
index 2036c08..ad394b1 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)
+        putOne(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.putOne(ci.connector, connection);
+        _connectionsByEndpoint.putOne(connection.endpoint(), connection);
+        _connectionsByEndpoint.putOne(connection.endpoint().compress(true), connection);
         return connection;
     }
 

commit e014d30299d962a003539430462581e7b462adae
Author: David M. Lee <dlee at digium.com>
Date:   Thu Oct 20 09:51:57 2011 -0500

    Fixed version check for libdb-5.

diff --git a/cpp/src/Freeze/MapI.cpp b/cpp/src/Freeze/MapI.cpp
index c7f0719..4aaa80a 100644
--- a/cpp/src/Freeze/MapI.cpp
+++ b/cpp/src/Freeze/MapI.cpp
@@ -1487,10 +1487,10 @@ Freeze::MapHelperI::size() const
 
     try
     {
-#if DB_VERSION_MAJOR != 4
-#error Freeze requires DB 4.x
+#if DB_VERSION_MAJOR < 4
+#error Freeze requires DB 4.x or greater
 #endif
-#if DB_VERSION_MINOR < 3
+#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 3
         _db->stat(&s, 0);
 #else
         _db->stat(_connection->dbTxn(), &s, 0);

commit ff4e5b38363534e002c6c58134612b0653d38c7b
Author: David M. Lee <dlee at digium.com>
Date:   Mon Oct 17 10:52:09 2011 -0500

    Fix IllegalArgumentException on Windows.
    
    When attempting to load a properties file, Ice first tries to open the
    given path as a resource.  Normally this fails by returning null, but on
    Windows there are times where this can throw an
    IllegalArgumentException.

diff --git a/java/src/IceInternal/Util.java b/java/src/IceInternal/Util.java
index c19e370..7e30015 100644
--- a/java/src/IceInternal/Util.java
+++ b/java/src/IceInternal/Util.java
@@ -40,7 +40,17 @@ public final class Util
         //
         // getResourceAsStream returns null if the resource can't be found.
         //
-        java.io.InputStream stream = cl.getResourceAsStream(path);
+        java.io.InputStream stream = null;
+        try
+        {
+            cl.getResourceAsStream(path);
+        }
+        catch(IllegalArgumentException e)
+        {
+            // If certain URL's are in the ClassLoader (i.e. http://felix.extensions:9),
+            // an absolute path to a file on Windows will cause an IllegalArgumentException.
+            // Since it's a file and not  a resource, ignore the exception.
+        }
         if(stream == null)
         {
             try

-----------------------------------------------------------------------


-- 
asterisk-scf/release/ice.git