[libbluray-devel] Fix AppsControlPermission
hpi1
git at videolan.org
Mon Sep 8 11:42:48 CEST 2014
libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Mon Sep 8 10:55:19 2014 +0300| [5ee88952ae3171c0893ea29338f12d95a60a07d3] | committer: hpi1
Fix AppsControlPermission
> http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=5ee88952ae3171c0893ea29338f12d95a60a07d3
---
.../org/dvb/application/AppsControlPermission.java | 23 ++++----------------
1 file changed, 4 insertions(+), 19 deletions(-)
diff --git a/src/libbluray/bdj/java/org/dvb/application/AppsControlPermission.java b/src/libbluray/bdj/java/org/dvb/application/AppsControlPermission.java
index 6214d2d..92d9c0c 100644
--- a/src/libbluray/bdj/java/org/dvb/application/AppsControlPermission.java
+++ b/src/libbluray/bdj/java/org/dvb/application/AppsControlPermission.java
@@ -35,7 +35,8 @@ public final class AppsControlPermission extends BasicPermission {
public String getActions()
{
- return actions;
+ // actions should be always null
+ return null;
}
public boolean implies(Permission perm)
@@ -45,29 +46,13 @@ public final class AppsControlPermission extends BasicPermission {
public boolean equals(Object obj)
{
- if (this == obj)
- return true;
- if (!super.equals(obj))
- return false;
- if (getClass() != obj.getClass())
- return false;
- AppsControlPermission other = (AppsControlPermission) obj;
- if (actions == null) {
- if (other.actions != null)
- return false;
- } else if (!actions.equals(other.actions))
- return false;
- return true;
+ return obj instanceof AppsControlPermission;
}
public int hashCode()
{
- final int prime = 31;
- int result = super.hashCode();
- result = prime * result + ((actions == null) ? 0 : actions.hashCode());
- return result;
+ return getClass().hashCode();
}
- private String actions;
private static final long serialVersionUID = 4003360685455291075L;
}
More information about the libbluray-devel
mailing list