You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2015/02/23 20:00:00 UTC

[1/2] logging-log4j2 git commit: Fix FindBugs: no need use a temporary Integer object.

Repository: logging-log4j2
Updated Branches:
  refs/heads/master 3f4831138 -> e6e99447f


Fix FindBugs: no need use a temporary Integer object.

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/dba6e98f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/dba6e98f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/dba6e98f

Branch: refs/heads/master
Commit: dba6e98f1b47f5d70c2a01af75dee95d324feb3b
Parents: 84b55aa
Author: Gary Gregory <ga...@gmail.com>
Authored: Mon Feb 23 07:21:31 2015 -0800
Committer: Gary Gregory <ga...@gmail.com>
Committed: Mon Feb 23 07:21:31 2015 -0800

----------------------------------------------------------------------
 .../log4j/core/jackson/Log4jStackTraceElementDeserializer.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/dba6e98f/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Log4jStackTraceElementDeserializer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Log4jStackTraceElementDeserializer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Log4jStackTraceElementDeserializer.java
index 1fdb652..936ace1 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Log4jStackTraceElementDeserializer.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Log4jStackTraceElementDeserializer.java
@@ -62,7 +62,7 @@ public final class Log4jStackTraceElementDeserializer extends StdScalarDeseriali
                     } else {
                         // An XML number always comes in a string since there is no syntax help as with JSON.
                         try {
-                            lineNumber = Integer.valueOf(jp.getText().trim()).intValue();
+                            lineNumber = Integer.parseInt(jp.getText().trim());
                         } catch (final NumberFormatException e) {
                             throw JsonMappingException.from(jp, "Non-numeric token (" + t + ") for property 'line'", e);
                         }


[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git

Posted by gg...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e6e99447
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e6e99447
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e6e99447

Branch: refs/heads/master
Commit: e6e99447f456dc0bd42ae0c3fa688c04e764351c
Parents: dba6e98 3f48311
Author: Gary Gregory <ga...@gmail.com>
Authored: Mon Feb 23 10:48:43 2015 -0800
Committer: Gary Gregory <ga...@gmail.com>
Committed: Mon Feb 23 10:48:43 2015 -0800

----------------------------------------------------------------------
 RELEASE-NOTES.txt                               | 294 ++++---------------
 log4j-1.2-api/pom.xml                           |   2 +-
 log4j-api/pom.xml                               |   2 +-
 .../org/apache/logging/log4j/util/Strings.java  |  30 +-
 log4j-bom/pom.xml                               |   2 +-
 log4j-core/pom.xml                              |   2 +-
 .../apache/logging/log4j/core/jmx/Server.java   |  58 ++--
 log4j-distribution/pom.xml                      |   2 +-
 log4j-flume-ng/pom.xml                          |   2 +-
 log4j-iostreams/pom.xml                         |   2 +-
 log4j-jcl/pom.xml                               |   2 +-
 log4j-jmx-gui/pom.xml                           |   2 +-
 log4j-jul/pom.xml                               |   2 +-
 log4j-nosql/pom.xml                             |   2 +-
 log4j-perf/pom.xml                              |   2 +-
 log4j-samples/flume-common/pom.xml              |   2 +-
 log4j-samples/flume-embedded/pom.xml            |   2 +-
 log4j-samples/flume-remote/pom.xml              |   2 +-
 log4j-samples/pom.xml                           |   2 +-
 log4j-slf4j-impl/pom.xml                        |   2 +-
 log4j-taglib/pom.xml                            |   2 +-
 log4j-to-slf4j/pom.xml                          |   2 +-
 log4j-web/pom.xml                               |   2 +-
 pom.xml                                         |   2 +-
 src/changes/announcement.vm                     | 185 +-----------
 src/changes/changes.xml                         |   9 +-
 src/site/xdoc/faq.xml                           |   5 +-
 src/site/xdoc/manual/configuration.xml.vm       |  10 +
 28 files changed, 151 insertions(+), 482 deletions(-)
----------------------------------------------------------------------