From 169f971c2b32bc786da6b02623f2e134da3ec6a8 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <timm.fitschen@ds.mpg.de>
Date: Thu, 13 Dec 2018 12:03:50 +0100
Subject: [PATCH] BUG: NullPointer for message code
---
conf/usersources.ini.template | 2 +-
src/main/java/caosdb/server/entity/Message.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/conf/usersources.ini.template b/conf/usersources.ini.template
index eaf394a5..df221ef5 100644
--- a/conf/usersources.ini.template
+++ b/conf/usersources.ini.template
@@ -32,4 +32,4 @@ default_status = ACTIVE
;exclude.group = [uncomment and put excluded groups here]
;it is necessary to add at least one admin
-user.{a user}.roles = administration
+;user.[uncomment a set a username here].roles = administration
diff --git a/src/main/java/caosdb/server/entity/Message.java b/src/main/java/caosdb/server/entity/Message.java
index 002a2cb1..03e78825 100644
--- a/src/main/java/caosdb/server/entity/Message.java
+++ b/src/main/java/caosdb/server/entity/Message.java
@@ -79,20 +79,20 @@ public class Message extends Exception implements Comparable<Message>, ToElement
this(type, code, null, null);
}
- public Message(final int code, final String description) {
+ public Message(final Integer code, final String description) {
this("Message", code, description, null);
}
- public Message(final MessageType type, final int code, final String description) {
+ public Message(final MessageType type, final Integer code, final String description) {
this(type.toString(), code, description, null);
}
public Message(
- final MessageType type, final int code, final String description, final String body) {
+ final MessageType type, final Integer code, final String description, final String body) {
this(type.toString(), code, description, body);
}
- public Message(final String type, final int code, final String description) {
+ public Message(final String type, final Integer code, final String description) {
this(type, code, description, null);
}
--
GitLab