Forgot to commit UserModel with cookie field

James Moger

2012-07-11 a31cf95ac0787eb559cb78f48c52bc6b79e970d8

 src/com/gitblit/GitBlit.java

@@ -512,9 +512,15 @@
            userCookie = new Cookie(Constants.NAME, "");

         } else {

            // set cookie for login

            char[] cookie = userService.getCookie(user);

            userCookie = new Cookie(Constants.NAME, new String(cookie));

            userCookie.setMaxAge(Integer.MAX_VALUE);

            String cookie = userService.getCookie(user);

            if (StringUtils.isEmpty(cookie)) {

               // create empty cookie

               userCookie = new Cookie(Constants.NAME, "");

            } else {

               // create real cookie

               userCookie = new Cookie(Constants.NAME, cookie);

               userCookie.setMaxAge(Integer.MAX_VALUE);

            }

         }

         userCookie.setPath("/");

         response.addCookie(userCookie);

@@ -1823,9 +1829,13 @@
      // ensure that the current values are updated in the setting models

      for (String key : settings.getAllKeys(null)) {

         SettingModel setting = settingsModel.get(key);

         if (setting != null) {

            setting.currentValue = settings.getString(key, "");

         if (setting == null) {

            // unreferenced setting, create a setting model

            setting = new SettingModel();

            setting.name = key;

            settingsModel.add(setting);

         }

         setting.currentValue = settings.getString(key, "");			
      }

      settingsModel.pushScripts = getAllScripts();

      return settingsModel;