From 4742fe5c1daa802352c50e34398e6d8eb6b63c9c Mon Sep 17 00:00:00 2001 From: Timur Zhamakeev Date: Tue, 10 Apr 2018 16:03:53 +0600 Subject: [PATCH] #2379 code clean up. --- .../environment/impl/EnvironmentManagerSecureProxy.java | 8 -------- .../core/environment/metadata/rest/RestServiceImpl.java | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/management/server/core/environment-manager/environment-manager-impl/src/main/java/io/subutai/core/environment/impl/EnvironmentManagerSecureProxy.java b/management/server/core/environment-manager/environment-manager-impl/src/main/java/io/subutai/core/environment/impl/EnvironmentManagerSecureProxy.java index 772dbd745e0..17fb65fa529 100644 --- a/management/server/core/environment-manager/environment-manager-impl/src/main/java/io/subutai/core/environment/impl/EnvironmentManagerSecureProxy.java +++ b/management/server/core/environment-manager/environment-manager-impl/src/main/java/io/subutai/core/environment/impl/EnvironmentManagerSecureProxy.java @@ -960,14 +960,6 @@ public void placeEnvironmentInfoByContainerId( final String environmentId, final } - @Override - public void placeTokenToContainer( String environmentId, String containerIp, String token ) - throws EnvironmentNotFoundException, ContainerHostNotFoundException, CommandException - { - environmentManager.placeTokenToContainer( environmentId, containerIp, token ); - } - - @Override public String createTemplate( final String environmentId, final String containerId, final String templateName, final boolean privateTemplate ) throws PeerException, EnvironmentNotFoundException diff --git a/management/server/core/environment-metadata-manager/environment-metadata-manager-rest/src/main/java/io/subutai/core/environment/metadata/rest/RestServiceImpl.java b/management/server/core/environment-metadata-manager/environment-metadata-manager-rest/src/main/java/io/subutai/core/environment/metadata/rest/RestServiceImpl.java index 2589b0d2765..74cd966d7e9 100644 --- a/management/server/core/environment-metadata-manager/environment-metadata-manager-rest/src/main/java/io/subutai/core/environment/metadata/rest/RestServiceImpl.java +++ b/management/server/core/environment-metadata-manager/environment-metadata-manager-rest/src/main/java/io/subutai/core/environment/metadata/rest/RestServiceImpl.java @@ -36,7 +36,7 @@ public Response issueToken( String containerIp ) } catch ( TokenCreateException e ) { - return Response.status( Response.Status.UNAUTHORIZED ).build(); + return Response.status( Response.Status.INTERNAL_SERVER_ERROR ).build(); } }