peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

merge the new developmentbranch into the test branch #39

Closed
j23f0712 wants to merge 431 commits from development2 into dev/test
pull from: development2
merge into: peet:dev/test
Conversation 1 Commits 431 Files Changed 269 +7 -1
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit daa8c0bf9d - Show all commits

8
Projekte/mdga/client/src/main/java/pp/mdga/client/server/UUIDSerializer.java
View File

@@ -14,7 +14,11 @@ public <T> T readObject(ByteBuffer data, Class<T> c) throws IOException
byte[] uuid = new byte[36]; byte[] uuid = new byte[36];
data.get(uuid); data.get(uuid);
return (T) UUID.fromString(new String(uuid)); if(uuid.equals(new UUID(1, 1))) {
return null;
} else {
return (T) UUID.fromString(new String(uuid));
}
} }
@Override @Override
@@ -24,6 +28,8 @@ public void writeObject(ByteBuffer buffer, Object object) throws IOException
if(uuid != null) { if(uuid != null) {
buffer.put(uuid.toString().getBytes()); buffer.put(uuid.toString().getBytes());
} else {
buffer.put(new UUID(1, 1).toString().getBytes());
} }
} }
} }