Author: dblevins Date: Thu May 28 07:02:04 2009 New Revision: 779456 URL: http://svn.apache.org/viewvc?rev=779456&view=rev Log: Merging r778808 - http://svn.apache.org/viewvc?rev=778808&view=rev
svn merge -r 778807:778808 https://svn.apache.org/repos/asf/openejb/trunk/openejb3 . ------------------------------------------------------------------------ r778808 | dblevins | 2009-05-26 10:42:33 -0700 (Tue, 26 May 2009) | 1 line Don't log unused property messages for javamail sessions, OPENEJB-989 ------------------------------------------------------------------------ Modified: openejb/branches/openejb-3.1.1/ (props changed) openejb/branches/openejb-3.1.1/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Propchange: openejb/branches/openejb-3.1.1/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 28 07:02:04 2009 @@ -1 +1 @@ -/openejb/trunk/openejb3:778585 +/openejb/trunk/openejb3:778585,778808 Modified: openejb/branches/openejb-3.1.1/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=779456&r1=779455&r2=779456&view=diff ============================================================================== --- openejb/branches/openejb-3.1.1/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original) +++ openejb/branches/openejb-3.1.1/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Thu May 28 07:02:04 2009 @@ -1329,6 +1329,7 @@ //TODO: DMB: Make more robust later if (property.equalsIgnoreCase("properties")) return; if (property.equalsIgnoreCase("transactionManager")) return; + if (info.types.contains("javax.mail.Session")) return; //--- logger.getChildLogger("service").warning("unusedProperty", property, info.id);
