Markus Koschany pushed to branch upstream 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
- - - - -
3 changed files:
- pom.xml
- src/main/java/org/jboss/logmanager/formatters/Formatters.java
- src/test/java/org/jboss/logmanager/FilterTests.java
Changes:
=====================================
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/commit/beefe6267875558981364f13743d3c053f979fe7
---
View it on GitLab:
https://salsa.debian.org/java-team/jboss-logmanager/commit/beefe6267875558981364f13743d3c053f979fe7
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
pkg-java-commits mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
