You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2014/07/25 12:54:16 UTC
[11/12] git commit: Incorporated review comments PR#74 indentation
Incorporated review comments PR#74 indentation
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/4e8d7cea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/4e8d7cea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/4e8d7cea
Branch: refs/heads/master
Commit: 4e8d7ceaa248ed6c1f14d6cd528e0b77651ebf16
Parents: 7107304
Author: bhairavi sankar <bh...@gmail.com>
Authored: Fri Jul 18 17:34:14 2014 -0400
Committer: bhairavi sankar <bh...@gmail.com>
Committed: Tue Jul 22 23:20:26 2014 -0400
----------------------------------------------------------------------
usage/jsgui/src/main/webapp/assets/js/router.js | 4 ++--
.../java/brooklyn/rest/resources/ServerResource.java | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4e8d7cea/usage/jsgui/src/main/webapp/assets/js/router.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/js/router.js b/usage/jsgui/src/main/webapp/assets/js/router.js
index 09c96b2..3049e8f 100644
--- a/usage/jsgui/src/main/webapp/assets/js/router.js
+++ b/usage/jsgui/src/main/webapp/assets/js/router.js
@@ -93,8 +93,8 @@ define([
$.ajax({
type : "GET",
url : "/v1/server/user",
- dataType : "text",
- success : function(data) {
+ dataType : "text",
+ success : function(data) {
console.log("Successfully fetched user details");
if (data != null) {
$("#user").html(data);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4e8d7cea/usage/rest-server/src/main/java/brooklyn/rest/resources/ServerResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/ServerResource.java b/usage/rest-server/src/main/java/brooklyn/rest/resources/ServerResource.java
index 6b23242..648ac0d 100644
--- a/usage/rest-server/src/main/java/brooklyn/rest/resources/ServerResource.java
+++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/ServerResource.java
@@ -98,11 +98,11 @@ public class ServerResource extends AbstractBrooklynRestResource implements Serv
@Override
public String getUser() {
- EntitlementContext entitlementContext = Entitlements.getEntitlementContext();
- if (entitlementContext!=null && entitlementContext.user()!=null){
- return entitlementContext.user();
- } else {
- return null; //User can be null if no authentication was requested
- }
- }
+ EntitlementContext entitlementContext = Entitlements.getEntitlementContext();
+ if (entitlementContext!=null && entitlementContext.user()!=null){
+ return entitlementContext.user();
+ } else {
+ return null; //User can be null if no authentication was requested
+ }
+ }
}