Skip to content

Return Object.class from Instances#getType instead of throwing an exc… #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 22, 2016
Merged

Return Object.class from Instances#getType instead of throwing an exc… #162

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec84519
Return Object.class from Instances#getType instead of throwing an exc…
jlsalmon Jun 6, 2016
c173daf
Add a debug message when comparing instances of different types
jlsalmon Jun 9, 2016
8c99190
Fixed intentation
jlsalmon Jun 9, 2016
fa656e9
Improved debug message
jlsalmon Jun 20, 2016
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add a debug message when comparing instances of different types
  • Loading branch information
@jlsalmon
jlsalmon committed Jun 9, 2016
commit c173dafc99a6abc12c1aee4ebabb665fa36ac245
6 changes: 6 additions & 0 deletions src/main/java/de/danielbechler/diff/access/Instances.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import de.danielbechler.util.Assert;
import de.danielbechler.util.Classes;
import de.danielbechler.util.Collections;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.Collection;
import java.util.Map;
Expand All @@ -28,6 +30,7 @@

public class Instances
{
private static final Logger logger = LoggerFactory.getLogger(Instances.class);
private final Accessor sourceAccessor;
private final Object working;
private final Object base;
Expand Down Expand Up @@ -225,6 +228,9 @@ else if (sourceAccessorType != null)
// special handling for beans and arrays should go here
}
}

logger.info("Detected instances of different types " + types + ". " +
"Instances should normally either be null or have the exact same type.");
return Object.class;
}

Expand Down