Merge branch 'master' of github.com:wordnik/swagger-java-sample-app

ayush · Oct 27, 2011 · 6b4223d · 6b4223d
2 parents 41ab974 + 724538c
commit 6b4223d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/main/java/com/wordnik/swagger/sample/data/UserData.java b/src/main/java/com/wordnik/swagger/sample/data/UserData.java
@@ -51,11 +51,15 @@ public void addUser(User user) {
 	}
 
 	public void removeUser(String username) {
+        User userToRemove = null;
 		for (User user : users) {
 			if (user.getUsername().equals(username)) {
-				users.remove(user);
+				userToRemove = user;
 			}
 		}
+
+        if(userToRemove != null)
+            users.remove(userToRemove);
 	}
 
 	private static User createUser(long id, String username, String firstName,

diff --git a/src/main/java/com/wordnik/swagger/sample/util/ApiOriginFilter.java b/src/main/java/com/wordnik/swagger/sample/util/ApiOriginFilter.java
@@ -27,6 +27,8 @@ public void doFilter(ServletRequest request, ServletResponse response,
 			FilterChain chain) throws IOException, ServletException {
 		HttpServletResponse res = (HttpServletResponse) response;
 		res.addHeader("Access-Control-Allow-Origin", "*");
+		res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT");
+		res.addHeader("Access-Control-Allow-Headers", "Content-Type");
 		chain.doFilter(request, response);
 	}