You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/11/29 08:57:50 UTC

[1/2] git commit: Do not try to print the class name of the used input stream.

Updated Branches:
  refs/heads/master 3ecbe996e -> f81ad2a53


Do not try to print the class name of the used input stream.

If there is an error often the variable 'ois' is not initialized and causes NullPointerException and thus hides the real cause of the problem


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f81ad2a5
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f81ad2a5
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f81ad2a5

Branch: refs/heads/master
Commit: f81ad2a53a7bcba321d3faa7f0b484b0bb431da9
Parents: c8abde8
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Nov 28 15:03:07 2013 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Nov 29 08:56:48 2013 +0100

----------------------------------------------------------------------
 .../org/apache/wicket/serialize/java/JavaSerializer.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/f81ad2a5/wicket-core/src/main/java/org/apache/wicket/serialize/java/JavaSerializer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/serialize/java/JavaSerializer.java b/wicket-core/src/main/java/org/apache/wicket/serialize/java/JavaSerializer.java
index 1f6961c..7e201e2 100644
--- a/wicket-core/src/main/java/org/apache/wicket/serialize/java/JavaSerializer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/serialize/java/JavaSerializer.java
@@ -134,13 +134,13 @@ public class JavaSerializer implements ISerializer
 				}
 			}
 		}
-		catch (ClassNotFoundException e)
+		catch (ClassNotFoundException cnfx)
 		{
-			throw new RuntimeException("Could not deserialize object using: " + ois.getClass(), e);
+			throw new RuntimeException("Could not deserialize object from byte[]", cnfx);
 		}
-		catch (IOException e)
+		catch (IOException iox)
 		{
-			throw new RuntimeException("Could not deserialize object using: " + ois.getClass(), e);
+			throw new RuntimeException("Could not deserialize object from byte[]", iox);
 		}
 		finally
 		{


[2/2] git commit: Whitespace fixes

Posted by mg...@apache.org.
Whitespace fixes


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c8abde8b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c8abde8b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c8abde8b

Branch: refs/heads/master
Commit: c8abde8be1c0c983a7ac837a1b057a476478b783
Parents: 3ecbe99
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Nov 28 15:02:55 2013 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Nov 29 08:56:48 2013 +0100

----------------------------------------------------------------------
 .../archetype-resources/src/main/java/WicketApplication.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/c8abde8b/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/WicketApplication.java
----------------------------------------------------------------------
diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/WicketApplication.java b/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/WicketApplication.java
index 2649039..9979761 100644
--- a/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/WicketApplication.java
+++ b/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/WicketApplication.java
@@ -4,12 +4,13 @@ import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.protocol.http.WebApplication;
 
 /**
- * Application object for your web application. If you want to run this application without deploying, run the Start class.
+ * Application object for your web application.
+ * If you want to run this application without deploying, run the Start class.
  * 
  * @see ${package}.Start#main(String[])
  */
 public class WicketApplication extends WebApplication
-{    	
+{
 	/**
 	 * @see org.apache.wicket.Application#getHomePage()
 	 */