diff options
author | Simon Rettberg | 2015-09-08 17:38:07 +0200 |
---|---|---|
committer | Simon Rettberg | 2015-09-08 17:38:07 +0200 |
commit | 3aa85cd588b745fb2537dbe748580d9c3b980133 (patch) | |
tree | 42d2c622b089c40b856d9ef09ed50eaa68407b68 /src/main/java/org/openslx/imagemaster/localrpc/NetworkHandler.java | |
parent | Start adapting to new DB/Thrift model (diff) | |
download | masterserver-3aa85cd588b745fb2537dbe748580d9c3b980133.tar.gz masterserver-3aa85cd588b745fb2537dbe748580d9c3b980133.tar.xz masterserver-3aa85cd588b745fb2537dbe748580d9c3b980133.zip |
Compilable...
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/localrpc/NetworkHandler.java')
-rw-r--r-- | src/main/java/org/openslx/imagemaster/localrpc/NetworkHandler.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/imagemaster/localrpc/NetworkHandler.java b/src/main/java/org/openslx/imagemaster/localrpc/NetworkHandler.java index 96b1212..7223435 100644 --- a/src/main/java/org/openslx/imagemaster/localrpc/NetworkHandler.java +++ b/src/main/java/org/openslx/imagemaster/localrpc/NetworkHandler.java @@ -12,9 +12,9 @@ import java.util.concurrent.LinkedBlockingQueue; import org.apache.log4j.Logger; import org.openslx.bwlp.thrift.iface.ClientSessionData; +import org.openslx.bwlp.thrift.iface.UserInfo; import org.openslx.imagemaster.session.Session; import org.openslx.imagemaster.session.SessionManager; -import org.openslx.imagemaster.session.User; import com.google.gson.Gson; @@ -124,7 +124,7 @@ public class NetworkHandler implements Runnable { try { JsonUser ju = gson.fromJson( payload, JsonUser.class ); - User u = ju.toUser(); + UserInfo u = ju.toUser(); if ( u == null ) { log.warn( "Invalid or inomplete RPC data (" + payload + ")" ); return "Invalid or incomplete RPC data"; |