luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10 from adriaanm/gkossakowski-nameHashing/private-members 

Test & fix for regression in Lazy serialization uncovered by #2325
This commit is contained in:
Grzegorz Kossakowski 2015-12-22 19:46:43 +01:00
parent bad824c0b1 95da6ec5a6
commit b76db70044
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
interface/src/main/java/xsbti/api/AbstractLazy.java
View File

@ -3,11 +3,17 @@
*/
package xsbti.api;
import java.io.ObjectStreamException;
import java.io.ObjectStreamException;
public abstract class AbstractLazy<T> implements Lazy<T>, java.io.Serializable
{
private Object writeReplace() throws ObjectStreamException
// `writeReplace` must be `protected`, so that the `Impl` subclass
// inherits the serialization override.
//
// (See source-dependencies/java-analysis-serialization-error, which would
// crash trying to serialize an AbstractLazy, because it pulled in an
// unserializable type eventually.)
protected Object writeReplace() throws ObjectStreamException
{
return new StrictLazy<T>(get());
}

1
sbt/src/sbt-test/source-dependencies/java-analysis-serialization-error/Outer.java Normal file
View File

@ -0,0 +1 @@
public class Outer { private class T extends Thread {} }

1
sbt/src/sbt-test/source-dependencies/java-analysis-serialization-error/build.sbt Normal file
View File

@ -0,0 +1 @@
incOptions := incOptions.value.withNameHashing(true).withApiDebug(true)

1
sbt/src/sbt-test/source-dependencies/java-analysis-serialization-error/test Normal file
View File

@ -0,0 +1 @@
> compile