From: Giovanni Meo <gmeo@cisco.com>
Date: Tue, 27 Aug 2013 13:43:00 +0000 (+0000)
Subject: Merge changes I5809ac06,I4362cd4e
X-Git-Tag: releasepom-0.1.0~162
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=9822a34fdd144aeb9932492e1605715eb472ecad;hp=c7ea9849f6b8bcd3539d411cfa81d80426c68f22

Merge changes I5809ac06,I4362cd4e

* changes:
  Added Intellij files to gitignore
  Fixed typo and remove unecessary java.lang import
---

diff --git a/.gitignore b/.gitignore
index d1b82619fd..52881a35c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,8 @@ target
 .settings
 MANIFEST.MF
 opendaylight/northbound/integrationtest/logs/*
+*.ipr
+*.iml
+*.iws
+.idea
+
diff --git a/opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/DijkstraImplementation.java b/opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/DijkstraImplementation.java
index a8ef381528..07f18ff6ab 100644
--- a/opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/DijkstraImplementation.java
+++ b/opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/DijkstraImplementation.java
@@ -37,8 +37,6 @@ import edu.uci.ics.jung.graph.Graph;
 import edu.uci.ics.jung.graph.SparseMultigraph;
 import edu.uci.ics.jung.graph.util.EdgeType;
 
-import java.lang.Exception;
-import java.lang.IllegalArgumentException;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -234,7 +232,7 @@ public class DijkstraImplementation implements IRouting, ITopologyManagerCluster
     @Override
     public synchronized void clearMaxThroughput() {
         if (mtp != null) {
-            mtp.reset(); // reset maxthruput path
+            mtp.reset(); // reset max throughput path
         }
     }