You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2012/11/15 08:21:38 UTC
svn commit: r1409672 - in /cxf/branches/2.6.x-fixes: ./
api/src/main/java/org/apache/cxf/message/MessageImpl.java
Author: ningjiang
Date: Thu Nov 15 07:21:37 2012
New Revision: 1409672
URL: http://svn.apache.org/viewvc?rev=1409672&view=rev
Log:
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.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/message/MessageImpl.java
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1409665
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/message/MessageImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/message/MessageImpl.java?rev=1409672&r1=1409671&r2=1409672&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/message/MessageImpl.java (original)
+++ cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/message/MessageImpl.java Thu Nov 15 07:21:37 2012
@@ -181,7 +181,7 @@ public class MessageImpl extends StringM
private static final long serialVersionUID = 7067290677790419348L;
public void putAll(Map<? extends String, ? extends Object> m) {
- if (m != null) {
+ if (m != null && m.size() > 0) {
super.putAll(m);
}
}