Removed some C++ style code

Signed-off-by: Kelly Davis <kdavis@mozilla.com>
hkuhn42 · Mar 7, 2016 · 0a7f78f · 0a7f78f
1 parent 404a2f5
commit 0a7f78f
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/....eclipse.smarthome.io.audio/src/main/java/org/eclipse/smarthome/io/audio/AudioFormat.java b/....eclipse.smarthome.io.audio/src/main/java/org/eclipse/smarthome/io/audio/AudioFormat.java
@@ -141,22 +141,22 @@ public Long getFrequency() {
  * the same value for all non-null members of this instance.
  */
  boolean isCompatible(AudioFormat audioFormat) {
- if (getContainer() && (getContainer() != audioFormat.getContainer())) {
+ if ((null != getContainer()) && (getContainer() != audioFormat.getContainer())) {
  return false;
  }
- if (getCodec() && (getCodec() != audioFormat.getCodec())) {
+ if ((null != getCodec()) && (getCodec() != audioFormat.getCodec())) {
  return false;
  }
- if (getBigEndian() && (getBigEndian() != audioFormat.getBigEndian())) {
+ if ((null != getBigEndian()) && (getBigEndian() != audioFormat.getBigEndian())) {
  return false;
  }
- if (getBitDepth() && (getBitDepth() != audioFormat.getBitDepth())) {
+ if ((null != getBitDepth()) && (getBitDepth() != audioFormat.getBitDepth())) {
  return false;
  }
- if (getBitRate() && (getBitRate() != audioFormat.getBitRate())) {
+ if ((null != getBitRate()) && (getBitRate() != audioFormat.getBitRate())) {
  return false;
  }
- if (getFrequency() && (getFrequency() != audioFormat.getFrequency())) {
+ if ((null != getFrequency()) && (getFrequency() != audioFormat.getFrequency())) {
  return false;
  }
  return true;