You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2007/08/15 04:21:07 UTC

svn commit: r566004 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java

Author: dblevins
Date: Tue Aug 14 19:21:06 2007
New Revision: 566004

URL: http://svn.apache.org/viewvc?view=rev&rev=566004
Log:
Should hopefully fix the 'inconvertable type' compile error some of us get. -- smaller fix.

Modified:
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java?view=diff&rev=566004&r1=566003&r2=566004
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java Tue Aug 14 19:21:06 2007
@@ -109,12 +109,7 @@
             Properties envEntriesProps = new Properties();
             envEntriesProps.load(in);
 
-            HashMap<String, String> envEntriesMap = new HashMap<String, String>();
-            for (Map.Entry<Object, Object> entry : envEntriesProps.entrySet()) {
-                envEntriesMap.put((String)entry.getKey(), (String)entry.getValue());
-            }
-
-            return envEntriesMap;
+            return new HashMap(envEntriesProps);
         } catch (IOException e) {
             log.error("envprops.notLoaded", e, propsUrl.toExternalForm());
             return Collections.EMPTY_MAP;



Re: svn commit: r566004 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java

Posted by Karan Malhi <ka...@gmail.com>.
I re-ran the build, the issue is fixed and can be closed!!

On 8/14/07, dblevins@apache.org <db...@apache.org> wrote:
> Author: dblevins
> Date: Tue Aug 14 19:21:06 2007
> New Revision: 566004
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=566004
> Log:
> Should hopefully fix the 'inconvertable type' compile error some of us get. -- smaller fix.
>
> Modified:
>     openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java
>
> Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java
> URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java?view=diff&rev=566004&r1=566003&r2=566004
> ==============================================================================
> --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java (original)
> +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java Tue Aug 14 19:21:06 2007
> @@ -109,12 +109,7 @@
>              Properties envEntriesProps = new Properties();
>              envEntriesProps.load(in);
>
> -            HashMap<String, String> envEntriesMap = new HashMap<String, String>();
> -            for (Map.Entry<Object, Object> entry : envEntriesProps.entrySet()) {
> -                envEntriesMap.put((String)entry.getKey(), (String)entry.getValue());
> -            }
> -
> -            return envEntriesMap;
> +            return new HashMap(envEntriesProps);
>          } catch (IOException e) {
>              log.error("envprops.notLoaded", e, propsUrl.toExternalForm());
>              return Collections.EMPTY_MAP;
>
>
>


-- 
Karan Singh Malhi