[Git][java-team/jboss-logmanager][master] 3 commits: New upstream version 2.1.2

[Markus Koschany]

Markus Koschany pushed to branch master at Debian Java Maintainers / jboss-logmanager


Commits:
beefe626 by Markus Koschany at 2018-05-11T21:22:11+02:00
New upstream version 2.1.2
- - - - -
2a7f0fc0 by Markus Koschany at 2018-05-11T21:22:15+02:00
Update upstream source from tag 'upstream/2.1.2'

Update to upstream version '2.1.2'
with Debian dir e56637d622f3fd63a306dd545f7f350ce2480849
- - - - -
0ca3ff00 by Markus Koschany at 2018-05-11T21:23:16+02:00
Update changelog

- - - - -


4 changed files:

- debian/changelog
- pom.xml
- src/main/java/org/jboss/logmanager/formatters/Formatters.java
- src/test/java/org/jboss/logmanager/FilterTests.java


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jboss-logmanager (2.1.2-1) unstable; urgency=medium
+
+  * New upstream version 2.1.2.
+
+ -- Markus Koschany <apo at debian.org>  Fri, 11 May 2018 21:22:37 +0200
+
 jboss-logmanager (2.1.1-1) unstable; urgency=medium
 
   * New upstream version 2.1.1.


=====================================
pom.xml
=====================================
--- a/pom.xml
+++ b/pom.xml
@@ -28,12 +28,12 @@
     <groupId>org.jboss.logmanager</groupId>
     <artifactId>jboss-logmanager</artifactId>
     <packaging>jar</packaging>
-    <version>2.1.1.Final</version>
+    <version>2.1.2.Final</version>
 
     <parent>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-parent</artifactId>
-        <version>25</version>
+        <version>26</version>
     </parent>
 
     <licenses>
@@ -205,6 +205,12 @@
                 </executions>
             </plugin>
             <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <doclint>none</doclint>
+                </configuration>
+            </plugin>
+            <plugin>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
             <plugin>


=====================================
src/main/java/org/jboss/logmanager/formatters/Formatters.java
=====================================
--- a/src/main/java/org/jboss/logmanager/formatters/Formatters.java
+++ b/src/main/java/org/jboss/logmanager/formatters/Formatters.java
@@ -120,7 +120,7 @@ public final class Formatters {
      * @return the substring
      */
     private static String applySegments(final String precision, final String subject) {
-        if (precision == null) {
+        if (precision == null || subject == null) {
             return subject;
         }
 


=====================================
src/test/java/org/jboss/logmanager/FilterTests.java
=====================================
--- a/src/test/java/org/jboss/logmanager/FilterTests.java
+++ b/src/test/java/org/jboss/logmanager/FilterTests.java
@@ -437,6 +437,15 @@ public final class FilterTests {
     }
 
     @Test
+    public void regexFilterExceptionNullMessageTest(){
+        final ExtLogRecord logRecord = new ExtLogRecord(Level.ALL, null, null);
+        final Filter filter = new RegexFilter("test");
+        boolean isLoggable = filter.isLoggable(logRecord);
+        assertFalse(isLoggable);
+        assertNull(logRecord.getFormattedMessage());
+    }
+
+    @Test
     public void testSubstitueFilter0() {
         final Filter filter = new SubstituteFilter(Pattern.compile("test"), "lunch", true);
         final AtomicReference<String> result = new AtomicReference<String>();
@@ -490,6 +499,14 @@ public final class FilterTests {
         assertEquals("Substitution was not correctly applied", "This is a lunches lunches", record.getFormattedMessage());
     }
 
+    @Test
+    public void substituteFilterExceptionNullMessageTest(){
+        final ExtLogRecord logRecord = new ExtLogRecord(Level.ALL, null, null);
+        final Filter filter = new SubstituteFilter(Pattern.compile("test"), "lunch", true);
+        filter.isLoggable(logRecord);
+        assertEquals("null", logRecord.getFormattedMessage());
+    }
+
 
 
     private static final class MessageCheckingHandler extends Handler {



View it on GitLab: https://salsa.debian.org/java-team/jboss-logmanager/compare/b077916e8e48bce9b60b2c2ea2eb94e611e8812d...0ca3ff00484e8c3b38c577408a7e49935da307f2

---
View it on GitLab: https://salsa.debian.org/java-team/jboss-logmanager/compare/b077916e8e48bce9b60b2c2ea2eb94e611e8812d...0ca3ff00484e8c3b38c577408a7e49935da307f2
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180511/65ec573c/attachment.html>