From e22c3f33a00903b49c5cfa571b21199ca528af47 Mon Sep 17 00:00:00 2001
From: Shudong Zhou <shudongzhou@gmail.com>
Date: Thu, 9 Feb 2012 14:03:51 -0800
Subject: [PATCH] Fix base controller exception catch, undo previous catch add
---
.../floodlightcontroller/core/internal/Controller.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/java/net/floodlightcontroller/core/internal/Controller.java b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
index 93fb9364b..0836faeca 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/Controller.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
@@ -342,7 +342,9 @@ public class Controller
processOFMessage((OFMessage)e.getMessage());
}
} catch (Exception ex) {
- Channels.fireExceptionCaught(ctx, ex);
+ // We are the last handler in the stream, so run the exception
+ // through the channel again by passing in ctx.getChannel().
+ Channels.fireExceptionCaught(ctx.getChannel(), ex);
}
}
@@ -572,8 +574,6 @@ public class Controller
handleMessage(sw, m, null);
break;
}
- } catch (Exception e) {
- log.warn("Exeption in handling OF message {}", e);
}
finally {
sw.processMessageLock().unlock();
@@ -1221,8 +1221,6 @@ public class Controller
}
}
switchResultSet.save();
- } catch (Exception e) {
- log.error("Error updating switch info {}", e);
}
finally {
if (switchResultSet != null)
--
GitLab