diff options
| author | Nils Schwabe | 2014-07-10 16:27:04 +0200 |
|---|---|---|
| committer | Nils Schwabe | 2014-07-10 16:27:04 +0200 |
| commit | 9ccff035621a36e0af7b45ed499aec215adc3185 (patch) | |
| tree | 3959ab4ec6c605509eefffada0f05cbc4e2b9841 /src/main | |
| parent | Implement method for server to check if he is authenticated (diff) | |
| download | masterserver-9ccff035621a36e0af7b45ed499aec215adc3185.tar.gz masterserver-9ccff035621a36e0af7b45ed499aec215adc3185.tar.xz masterserver-9ccff035621a36e0af7b45ed499aec215adc3185.zip | |
Add refreshing of server session
Diffstat (limited to 'src/main')
3 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java b/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java index f1f8887..439087a 100644 --- a/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java +++ b/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java @@ -10,8 +10,6 @@ import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; import java.security.UnrecoverableKeyException; import java.security.cert.CertificateException; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/org/openslx/imagemaster/serversession/ServerSessionManager.java b/src/main/java/org/openslx/imagemaster/serversession/ServerSessionManager.java index cd0cfc9..47abf0e 100644 --- a/src/main/java/org/openslx/imagemaster/serversession/ServerSessionManager.java +++ b/src/main/java/org/openslx/imagemaster/serversession/ServerSessionManager.java @@ -43,6 +43,7 @@ public class ServerSessionManager if ( serverSession == null || serverSession.timedOut() ) { return null; } + serverSession.refresh(); return serverSession; } diff --git a/src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java b/src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java index bef8191..ad3a57d 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java +++ b/src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java @@ -73,4 +73,10 @@ public class ImageServerHandler implements ImageServer.Iface { return ApiServer.getImage( uuid, serverSessionId, requestedBlocks ); } + + @Override + public boolean isServerAuthenticated( String serverSessionId ) throws TException + { + return ApiServer.isServerAuthenticated( serverSessionId ); + } } |