Author: ningjiang Date: Thu Nov 15 07:35:42 2012 New Revision: 1409674 URL: http://svn.apache.org/viewvc?rev=1409674&view=rev Log: Merged revisions 1409672 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
................ r1409672 | ningjiang | 2012-11-15 15:21:37 +0800 (Thu, 15 Nov 2012) | 9 lines Merged revisions 1409665 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1409665 | ningjiang | 2012-11-15 14:52:59 +0800 (Thu, 15 Nov 2012) | 1 line Fixed the NPE of WadlGeneratorTest on AIX JDK ........ ................ Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/message/MessageImpl.java Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/trunk:r1409665 Merged /cxf/branches/2.6.x-fixes:r1409672 Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/message/MessageImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/message/MessageImpl.java?rev=1409674&r1=1409673&r2=1409674&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/message/MessageImpl.java (original) +++ cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/message/MessageImpl.java Thu Nov 15 07:35:42 2012 @@ -209,7 +209,7 @@ public class MessageImpl extends StringM private void calcContextCache() { Map<String, Object> o = new HashMap<String, Object>() { public void putAll(Map<? extends String, ? extends Object> m) { - if (m != null) { + if (m != null && m.size() > 0) { super.putAll(m); } }
