diff -r ccb2e126626f -r a47b35d53d12 jdk/src/java.desktop/macosx/classes/sun/lwawt/LWCheckboxPeer.java
--- a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWCheckboxPeer.java	Thu Apr 02 08:41:32 2015 -0700
+++ b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWCheckboxPeer.java	Thu Apr 02 19:53:53 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -132,7 +132,9 @@
     @Override
     public void setState(final boolean state) {
         synchronized (getDelegateLock()) {
+            getDelegate().getCurrentButton().removeItemListener(this);
             getDelegate().setSelected(state);
+            getDelegate().getCurrentButton().addItemListener(this);
         }
         repaintPeer();
     }