zdm/envoy
Archived
3
Fork 0
Code Issues 22 Pull Requests Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/develop' into f/groups

Browse Source 
Conflicts:
	src/main/java/envoy/server/data/User.java
	src/main/java/envoy/server/processors/IDGeneratorRequestProcessor.java
	src/main/java/envoy/server/processors/MessageProcessor.java
This commit is contained in:
delvh
2020-03-26 17:18:27 +01:00
parent 1d4492b3d5 6d8294a96a
commit f91b193d59
3 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/envoy/server/data/User.java
View File

@@ -5,7 +5,6 @@ import java.util.List;
import javax.persistence.*; import javax.persistence.*;
/** /**
* This class serves as a way to let Hibernate communicate with the server * This class serves as a way to let Hibernate communicate with the server
* without bringing the dependency of JPA/Hibernate into the client.<br> * without bringing the dependency of JPA/Hibernate into the client.<br>
@@ -33,7 +32,7 @@ import javax.persistence.*;
) )
public class User extends Contact { public class User extends Contact {
private byte[] passwordHash; private byte[] passwordHash;
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Date lastSeen; private Date lastSeen;

1
src/main/java/envoy/server/processors/IDGeneratorRequestProcessor.java
View File

@@ -28,7 +28,6 @@ public class IDGeneratorRequestProcessor implements ObjectProcessor<IDGeneratorR
public void process(IDGeneratorRequest input, long socketId, ObjectWriteProxy writeProxy) throws IOException { public void process(IDGeneratorRequest input, long socketId, ObjectWriteProxy writeProxy) throws IOException {
System.out.println("Received id generation request."); System.out.println("Received id generation request.");
var generator = createIDGenerator(); var generator = createIDGenerator();
System.out.println("Sending new id generator " + generator); System.out.println("Sending new id generator " + generator);
writeProxy.write(socketId, generator); writeProxy.write(socketId, generator);
} }

1
src/main/java/envoy/server/processors/MessageProcessor.java
View File

@@ -27,7 +27,6 @@ public class MessageProcessor implements ObjectProcessor<Message> {
@Override @Override
public void process(Message message, long socketId, ObjectWriteProxy writeProxy) { public void process(Message message, long socketId, ObjectWriteProxy writeProxy) {
message.nextStatus(); message.nextStatus();
ConnectionManager connectionManager = ConnectionManager.getInstance(); ConnectionManager connectionManager = ConnectionManager.getInstance();
Contact recipient = PersistenceManager.getInstance().getContactById(message.getID()); Contact recipient = PersistenceManager.getInstance().getContactById(message.getID());