polishing

jhoeller · jhoeller · commit 9ddfb375cbf6 · 2011-07-18T20:49:58.000Z
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java b/org.springframework.orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@
  * supporting this transaction management mechanism.
  *
  * <p>This transaction manager is appropriate for applications that use a single
- * JPA EntityManagerFactory for  transactional data access. JTA (usually through
+ * JPA EntityManagerFactory for transactional data access. JTA (usually through
  * {@link org.springframework.transaction.jta.JtaTransactionManager}) is necessary
  * for accessing multiple transactional resources within the same transaction.
  * Note that you need to configure your JPA provider accordingly in order to make
@@ -184,7 +184,7 @@ public Map<String, Object> getJpaPropertyMap() {
 
 	/**
 	 * Set the JDBC DataSource that this instance should manage transactions for.
-   * The DataSource should match the one used by the JPA EntityManagerFactory:
+     * The DataSource should match the one used by the JPA EntityManagerFactory:
 	 * for example, you could specify the same JNDI DataSource for both.
 	 * <p>If the EntityManagerFactory uses a known DataSource as connection factory,
 	 * the DataSource will be autodetected: You can still explictly specify the
diff --git a/org.springframework.web/src/main/java/org/springframework/web/multipart/commons/CommonsFileUploadSupport.java b/org.springframework.web/src/main/java/org/springframework/web/multipart/commons/CommonsFileUploadSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -291,7 +291,7 @@ private String determineEncoding(String contentTypeHeader, String defaultEncodin
 		}
 		MediaType contentType = MediaType.parseMediaType(contentTypeHeader);
 		Charset charset = contentType.getCharSet();
-		return charset != null ? charset.name() : defaultEncoding;
+		return (charset != null ? charset.name() : defaultEncoding);
 	}
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2010 the original author or authors.`
	`2`	`+ * Copyright 2002-2011 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -291,7 +291,7 @@ private String determineEncoding(String contentTypeHeader, String defaultEncodin`
`291`	`291`	`}`
`292`	`292`	`MediaType contentType = MediaType.parseMediaType(contentTypeHeader);`
`293`	`293`	`Charset charset = contentType.getCharSet();`
`294`		`- return charset != null ? charset.name() : defaultEncoding;`
	`294`	`+ return (charset != null ? charset.name() : defaultEncoding);`
`295`	`295`	`}`
`296`	`296`
`297`	`297`