Merge "Prevent ConfigPusher from killing its thread"

[controller.git] / opendaylight / protocol_plugins / stub / src / main / java / org / opendaylight / controller / protocol_plugins / stub / internal / StubNodeFactory.java

diff --git a/opendaylight/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/StubNodeFactory.java b/opendaylight/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/StubNodeFactory.java
index c2ce473303632b90602986b806690a5f225146e4..c5a9de3032bc15d4ccd20f4c47460d4d3bfffeb6 100644 (file)
--- a/opendaylight/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/StubNodeFactory.java
+++ b/opendaylight/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/StubNodeFactory.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.opendaylight.controller.protocol_plugins.stub.internal;
 
 import org.opendaylight.controller.sal.core.ConstructionException;
@@ -13,7 +20,7 @@ public class StubNodeFactory implements INodeFactory
        * Function called by the dependency manager when at least one dependency
        * become unsatisfied or when the component is shutting down because for
        * example bundle is being stopped.
-       * 
+       *
        */
       void destroy() {
       }
@@ -21,7 +28,7 @@ public class StubNodeFactory implements INodeFactory
       /**
        * Function called by dependency manager after "init ()" is called and after
        * the services provided by the class are registered in the service registry
-       * 
+       *
        */
       void start() {
       }
@@ -30,12 +37,12 @@ public class StubNodeFactory implements INodeFactory
        * Function called by the dependency manager before the services exported by
        * the component are unregistered, this will be followed by a "destroy ()"
        * calls
-       * 
+       *
        */
       void stop() {
       }
-      
-      public Node fromString(String nodeId, String nodeType){
+
+      public Node fromString(String nodeType, String nodeId){
           if(nodeType.equals("STUB"))
               try{
                   return new Node("STUB", Integer.parseInt(nodeId));