commit 0738570bd92f0c1a5fc9e037ff71392f0debafb1
author Matthias Koller <m.koller@peak-solution.de> Mon Jun 20 17:12:59 2016 +0200
committer Christian Weyermann <c.weyermann@peak-solution.de> Fri Aug 19 17:23:07 2016 +0200
tree 8a890a7421b4e2991b3a68ef49828512376073bc
parent b5cff9d7fc72d3aaad2e9933f82827c4acdbd5ac

Merge branch 'notification' of
ssh://git@10.210.0.66:22/git/MDM5/org.eclipse.mdm.api.base.git into
notification

Conflicts:
	src/main/java/org/eclipse/mdm/api/base/notification/NotificationException.java
	src/main/java/org/eclipse/mdm/api/base/notification/NotificationFilter.java
	src/main/java/org/eclipse/mdm/api/base/notification/NotificationListener.java
	src/main/java/org/eclipse/mdm/api/base/notification/NotificationManager.java

src/main/java/org/eclipse/mdm/api/base/notification/NotificationException.java

diff --git a/src/main/java/org/eclipse/mdm/api/base/notification/NotificationException.java b/src/main/java/org/eclipse/mdm/api/base/notification/NotificationException.java
index 870b491..1127a4e 100644
--- a/src/main/java/org/eclipse/mdm/api/base/notification/NotificationException.java
+++ b/src/main/java/org/eclipse/mdm/api/base/notification/NotificationException.java
@@ -25,8 +25,8 @@
 	 * @param message The error message.
 	 * @param throwable The origin cause.
 	 */
-	public NotificationException(String message, Throwable throwable) {
-		super(message, throwable);
+	public NotificationException(String message, Throwable cause) {
+		super(message, cause);
 	}
 
 }