Checkstyle enforcer

[controller.git] / opendaylight / web / root / src / main / java / org / opendaylight / controller / web / DaylightWebAdmin.java

diff --git a/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/DaylightWebAdmin.java b/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/DaylightWebAdmin.java
index 7c45bb8cee04433502b3ad5e3567f8d211c87428..c748171685ebcbe7886229987d1eda67c62d03ab 100644 (file)
--- a/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/DaylightWebAdmin.java
+++ b/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/DaylightWebAdmin.java
@@ -95,35 +95,33 @@ public class DaylightWebAdmin {
 
         return userManager.removeLocalUser(userName).getDescription();
     }
-    
+
     @RequestMapping(value = "/users/password/{username}", method = RequestMethod.POST)
     @ResponseBody
     public Status changePassword(@PathVariable("username") String username, HttpServletRequest request,
             @RequestParam("currentPassword") String currentPassword, @RequestParam("newPassword") String newPassword) {
-        String user = request.getUserPrincipal().getName();
-        
         IUserManager userManager = (IUserManager) ServiceHelper
                 .getGlobalInstance(IUserManager.class, this);
         if (userManager == null) {
             return new Status(StatusCode.GONE, "User Manager not found");
         }
-        
+
         if (!authorize(userManager, UserLevel.NETWORKADMIN, request)) {
             return new Status(StatusCode.FORBIDDEN, "Operation not permitted");
         }
-        
+
         if (newPassword.isEmpty()) {
             return new Status(StatusCode.BADREQUEST, "Empty passwords not allowed");
         }
-        
-        Status status = userManager.changeLocalUserPassword(user, currentPassword, newPassword);
-        
+
+        Status status = userManager.changeLocalUserPassword(username, currentPassword, newPassword);
+
         return status;
     }
 
     /**
      * Is the operation permitted for the given level
-     * 
+     *
      * @param level
      */
     private boolean authorize(IUserManager userManager, UserLevel level,