From: Automerge Date: Mon, 21 May 2012 17:06:20 +0000 (+0000) Subject: [merge from 6.7] Remove duplicate code in constructor X-Git-Tag: 7.0.0.alpha3~146^2~1 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=12e35f034db98f5351c58c03b5277d4657e2ab28;p=vaadin-framework.git [merge from 6.7] Remove duplicate code in constructor svn changeset:23779/svn branch:6.8 --- diff --git a/src/com/vaadin/terminal/ClassResource.java b/src/com/vaadin/terminal/ClassResource.java index fa196e90d9..e7419576f1 100644 --- a/src/com/vaadin/terminal/ClassResource.java +++ b/src/com/vaadin/terminal/ClassResource.java @@ -60,13 +60,7 @@ public class ClassResource implements ApplicationResource, Serializable { * the application this resource will be added to. */ public ClassResource(String resourceName, Application application) { - associatedClass = application.getClass(); - this.resourceName = resourceName; - this.application = application; - if (resourceName == null) { - throw new NullPointerException(); - } - application.addResource(this); + this(application.getClass(), resourceName, application); } /**