Author: lindner
Date: Thu Jun 9 02:16:16 2011
New Revision: 1133628
URL: http://svn.apache.org/viewvc?rev=1133628&view=rev
Log:
fix bad merge
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/BasicAuthority.java
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/BasicAuthority.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/BasicAuthority.java?rev=1133628&r1=1133627&r2=1133628&view=diff
==============================================================================
---
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/BasicAuthority.java
(original)
+++
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/BasicAuthority.java
Thu Jun 9 02:16:16 2011
@@ -60,8 +60,7 @@ public class BasicAuthority implements A
}
public String getOrigin(){
- return Objects.firstNonNull(ServletRequestContext.getScheme(), "http")
- "://" + getAuthority();
+ return Objects.firstNonNull(ServletRequestContext.getScheme(), "http");
}
private String getServerPort() {
