You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2021/05/05 00:07:17 UTC
[cxf] branch 3.3.x-fixes updated (aabb6b0 -> 0e66d11)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from aabb6b0 Recording .gitmergeinfo Changes
new 15425bb CXF-8536 Conditional log for NamespaceMapper not found (#791)
new 3f32def Fixing Checkstyle violations
new 0e66d11 Recording .gitmergeinfo Changes
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 6 ++++++
.../java/org/apache/cxf/common/spi/NamespaceClassGenerator.java | 5 ++++-
2 files changed, 10 insertions(+), 1 deletion(-)
[cxf] 02/03: Fixing Checkstyle violations
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 3f32def47729324296ecceeb5bbc2e0462f55889
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue May 4 19:18:31 2021 -0400
Fixing Checkstyle violations
(cherry picked from commit b1b946d7a927b6d174bbb15c64fe4634d093df93)
(cherry picked from commit c22f719231fe3e2bdb6080d6162e69e465d46558)
---
.../main/java/org/apache/cxf/common/spi/NamespaceClassGenerator.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/core/src/main/java/org/apache/cxf/common/spi/NamespaceClassGenerator.java b/core/src/main/java/org/apache/cxf/common/spi/NamespaceClassGenerator.java
index 0bb307b..836288b 100644
--- a/core/src/main/java/org/apache/cxf/common/spi/NamespaceClassGenerator.java
+++ b/core/src/main/java/org/apache/cxf/common/spi/NamespaceClassGenerator.java
@@ -76,7 +76,8 @@ public class NamespaceClassGenerator extends ClassGeneratorClassLoader implement
}
}
if (cls == null) {
- LOG.log(Level.INFO, "Could not create a NamespaceMapper compatible with Marshaller class " + mcls.getName(), t);
+ LOG.log(Level.INFO, "Could not create a NamespaceMapper compatible with Marshaller class "
+ + mcls.getName(), t);
}
return cls;
}
[cxf] 03/03: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 0e66d110bb54a0663d8c0263593650611b8ff82f
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue May 4 20:06:47 2021 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index f453358..37d6dc2 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -293,6 +293,8 @@ B 71b0cee7b2148af88c005cccd4c46f64ffbf62dd
B 71d6c19e9ed5f875aad7f30100545175b2d4106f
B 723bb16431f1f03ed600c1b0c39049cb55c105d0
B 72882445f3c00faf3987c2025aec09679c0efb0b
+B 735d409bda8139688e0b708a67219af78ef60cad
+B 737a10c549dce7c13e432f3ebe2dea3996f243bc
B 74816c53c77e814bb6a1422b9ec525b839c7f078
B 7589d940c477beadc3b69f1d3552582fdb76940c
B 75bd4e800746b9f483146e4d15ffef3ad4f934cf
@@ -339,6 +341,7 @@ B 85b048e674b16541cf6a4a35ea96a7d1081faca9
B 85ba0e6e65374df37b253f32a183b336b6d64991
B 85f83dac15f6981ec47bbd3a46eee20732442d27
B 8723ff4f63020ba966268561b689fd9eb4349fda
+B 876842f1eb20ad8b2a5d61729e0485362a8a31f3
B 87b374f23c671b6cb3db77b6f1c765d2e321afff
B 88492662ae0e2bb84fc221979d055f4284900fa0
B 884fbd1277f20b6fbad139cce68c5ae129557de6
@@ -551,6 +554,7 @@ B dc61a65123769ce123a7b104a747d88c6e95e120
B dcf6d7ab478444d26afb97b677cbc2f292ddfbb8
B dd0feaaeee9a9a8e7ffb060f0cf46ef06b6b3d44
B dd1ccb028406995ea5143c53e886a5408cd50b92
+B dd438848118f8815e10213acd0530f070a0b12df
B de03dfae71010bd3719430d8d7453732f4c151ea
B de393404c3c2e6b0f2d93f11f5fef0c53385d57d
B de494a4f2bd3f2a99a7ddf57213bec3afe2b8300
@@ -841,6 +845,7 @@ M ad75417a3292e3165b1f6406b1920136a601b353
M aeb09e380af8e8e298bc569fbb82c33598fdb142
M aefdc0759e30cb44d1729f08d1f31ff516a14e03
M b3ad6ab5d9456b61d0a2a718c99819000836788b
+M b4e77553dbe3259fa5a36dd2c46d861dcf3ecb50
M b5902ef6f3e52b0a0be429a0114e59d404664080
M b70a3916daf64c15689a30e0a77bdb4c9dbaead4
M b7a9161816949c5c6380c41c6ddf1a712e3d5d3e
@@ -875,6 +880,7 @@ M d11e76c8df1571bbb37d663e5d2aebf5c6b3c441
M d17a51cbff36aa314374d4621434968422fb9c9f
M d2f8db651c418c82b08bc69900d9b90c5d9625bc
M d37c3907c3ae94e607a8cc411f9243562637aaa2
+M d43e0ef8651ef0dff5795125f8fbf9e850d0448d
M d5ad40bf29cf57f13aaeeca31e0aac61487095b4
M d5b612c220bab496c3dab1731e56b3fea36c1b07
M d737196d0cd89ec04565da740f8564bcf56b25a3
[cxf] 01/03: CXF-8536 Conditional log for NamespaceMapper not found
(#791)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 15425bb5432efe31ef565df27da11c755655096d
Author: Stefan Berger <be...@users.noreply.github.com>
AuthorDate: Wed May 5 00:57:05 2021 +0200
CXF-8536 Conditional log for NamespaceMapper not found (#791)
Only logs the message "Could not create a NamespaceMapper ..." if it really is the case
---
.../main/java/org/apache/cxf/common/spi/NamespaceClassGenerator.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/core/src/main/java/org/apache/cxf/common/spi/NamespaceClassGenerator.java b/core/src/main/java/org/apache/cxf/common/spi/NamespaceClassGenerator.java
index fbdc524..0bb307b 100644
--- a/core/src/main/java/org/apache/cxf/common/spi/NamespaceClassGenerator.java
+++ b/core/src/main/java/org/apache/cxf/common/spi/NamespaceClassGenerator.java
@@ -75,7 +75,9 @@ public class NamespaceClassGenerator extends ClassGeneratorClassLoader implement
t = ex2;
}
}
- LOG.log(Level.INFO, "Could not create a NamespaceMapper compatible with Marshaller class " + mcls.getName(), t);
+ if (cls == null) {
+ LOG.log(Level.INFO, "Could not create a NamespaceMapper compatible with Marshaller class " + mcls.getName(), t);
+ }
return cls;
}